From 1472f74c0baa8c8fd3df232c32b7947ff1255834 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Mon, 15 May 2017 10:49:43 +0000 Subject: [PATCH] ref 8580:TDM - TabMan - Support Java 8 compatibility https://support.d4science.org/issues/8580 Updated compatibility to Java 8 git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget@148655 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 6 +- distro/changelog.xml | 4 + pom.xml | 8 +- .../client/ColumnExpressionPanel.java | 235 +++----- .../client/ColumnFilterDialog.java | 4 +- .../client/ExpressionWidgetEntry.java | 4 +- .../client/MultiColumnExpressionPanel.java | 152 ++--- .../client/MultiColumnFilterDialog.java | 4 +- .../ReplaceColumnByExpressionDialog.java | 142 ++--- .../ReplaceColumnByExpressionPanel.java | 4 +- ...ceColumnByMultiColumnExpressionDialog.java | 133 ++--- ...aceColumnByMultiColumnExpressionPanel.java | 4 +- .../client/ReplaceExpressionDialog.java | 161 +++--- .../client/ReplaceExpressionPanel.java | 4 +- .../client/RowsDeleteByExpressionDialog.java | 4 +- ...wsDeleteByMultiColumnExpressionDialog.java | 4 +- .../client/RuleEditDialog.java | 4 +- .../client/RuleEditPanel.java | 4 +- .../client/RuleOnColumnCreateDialog.java | 7 +- .../client/RuleOnTableCreateDialog.java | 63 +-- .../TemplateColumnExpressionDialog.java | 105 ++-- .../TemplateMultiColumnExpressionDialog.java | 45 +- .../client/custom/DefaultAppearance.java | 4 +- .../client/custom/IconButton.java | 4 +- .../client/custom/IconButtonAppearance.java | 4 +- .../MultiColumnExpressionPanelException.java | 4 +- .../ConditionOnMultiColumnWidget.java | 4 +- .../client/expression/ConditionWidget.java | 4 +- .../client/expression/ReplaceWidget.java | 4 +- .../help/HelpReplaceColumnByExpression.java | 5 + .../HelpReplaceColumnByExpressionDialog.java | 4 +- .../HelpReplaceColumnByExpressionPanel.java | 4 +- .../client/multicolumn/ArgType.java | 4 +- .../multicolumn/ArgTypePropertiesCombo.java | 4 +- .../multicolumn/DepthOfExpressionElement.java | 4 +- ...pthOfExpressionElementPropertiesCombo.java | 4 +- .../multicolumn/DepthOfExpressionStore.java | 4 +- .../multicolumn/DepthOfExpressionType.java | 4 +- .../client/multicolumn/LogicalDepth.java | 4 +- .../ExpressionWrapperNotification.java | 4 +- .../notification/RuleDialogNotification.java | 4 +- .../RuleEditDialogNotification.java | 4 +- .../client/operation/Operation.java | 4 +- .../client/operation/OperationProperties.java | 4 +- .../client/operation/OperationsStore.java | 4 +- .../properties/ColumnDataProperties.java | 4 +- .../properties/ColumnDataPropertiesCombo.java | 4 +- .../properties/ColumnDataTypeProperties.java | 4 +- .../properties/ColumnTypeCodeProperties.java | 4 +- .../properties/LocaleTypeProperties.java | 4 +- .../client/properties/ReplaceElement.java | 4 +- .../properties/ReplaceElementProperties.java | 4 +- .../properties/ReplaceElementStore.java | 4 +- ...ColumnPlaceHolderDescriptorProperties.java | 4 +- .../properties/TabResourceProperties.java | 4 +- .../TabResourcePropertiesCombo.java | 4 +- .../client/resources/ExpressionResources.java | 4 +- .../client/rpc/ExpressionService.java | 75 +-- .../client/rpc/ExpressionServiceAsync.java | 4 +- .../client/store/ColumnDataTypeElement.java | 4 +- .../client/store/ColumnDataTypeStore.java | 4 +- .../client/store/ColumnTypeCodeElement.java | 4 +- .../client/store/ColumnTypeCodeStore.java | 9 +- .../client/store/LocaleTypeElement.java | 4 +- .../client/threshold/Threshold.java | 4 +- .../client/threshold/ThresholdProperties.java | 4 +- .../client/threshold/ThresholdStore.java | 4 +- .../client/type/ReplaceExpressionType.java | 4 +- .../client/utils/InfoMessageBox.java | 4 +- .../client/utils/UtilsGXT3.java | 4 +- .../server/CExpressionMapServlet.java | 4 +- .../server/C_ExpressionParser.java | 535 +++++++----------- .../server/ExpressionServiceImpl.java | 4 +- .../server/ExpressionSession.java | 4 +- .../service/rule/AppliedRulesResponseMap.java | 4 +- .../service/rule/RuleDescriptionMap.java | 4 +- .../server/service/rule/RuleScopeMap.java | 4 +- .../server/service/rule/RuleTypeMap.java | 4 +- .../td/expressionwidget/shared/Constants.java | 4 +- .../ConditionOnMultiColumnTypeMap.java | 4 +- .../shared/condition/ConditionTypeMap.java | 4 +- .../exception/ConditionTypeMapException.java | 22 +- .../exception/ExpressionParserException.java | 17 +- .../exception/ExpressionServiceException.java | 21 +- .../exception/ReplaceTypeMapException.java | 22 +- .../shared/model/C_OperatorType.java | 4 +- .../aggregation/C_AggregationExpression.java | 4 +- .../model/composite/aggregation/C_Avg.java | 9 +- .../model/composite/aggregation/C_Count.java | 9 +- .../model/composite/aggregation/C_Max.java | 9 +- .../model/composite/aggregation/C_Min.java | 9 +- .../composite/aggregation/C_ST_Extent.java | 12 +- .../model/composite/aggregation/C_Sum.java | 9 +- .../composite/arithmetic/C_Addition.java | 4 +- .../arithmetic/C_ArithmeticExpression.java | 4 +- .../composite/arithmetic/C_Division.java | 4 +- .../arithmetic/C_Exponentiation.java | 9 +- .../model/composite/arithmetic/C_Modulus.java | 4 +- .../arithmetic/C_Multiplication.java | 4 +- .../composite/arithmetic/C_Subtraction.java | 4 +- .../model/composite/comparable/C_Equals.java | 4 +- .../comparable/C_GreaterOrEquals.java | 4 +- .../composite/comparable/C_GreaterThan.java | 4 +- .../composite/comparable/C_LessOrEquals.java | 4 +- .../composite/comparable/C_LessThan.java | 4 +- .../composite/comparable/C_NotEquals.java | 4 +- .../composite/comparable/C_NotGreater.java | 4 +- .../model/composite/comparable/C_NotLess.java | 4 +- .../model/composite/functions/C_Cast.java | 4 +- .../shared/model/composite/text/C_Concat.java | 4 +- .../shared/model/composite/text/C_Lenght.java | 4 +- .../model/composite/text/C_Levenshtein.java | 4 +- .../shared/model/composite/text/C_Lower.java | 4 +- .../shared/model/composite/text/C_MD5.java | 4 +- .../model/composite/text/C_Similarity.java | 4 +- .../model/composite/text/C_Soundex.java | 4 +- .../composite/text/C_SubstringByIndex.java | 4 +- .../composite/text/C_SubstringByRegex.java | 4 +- .../composite/text/C_SubstringPosition.java | 4 +- .../composite/text/C_TextBeginsWith.java | 4 +- .../model/composite/text/C_TextContains.java | 4 +- .../model/composite/text/C_TextEndsWith.java | 4 +- .../composite/text/C_TextMatchSQLRegexp.java | 4 +- .../text/C_TextReplaceMatchingRegex.java | 4 +- .../shared/model/composite/text/C_Trim.java | 4 +- .../shared/model/composite/text/C_Upper.java | 4 +- .../shared/model/leaf/C_ColumnReference.java | 4 +- .../leaf/C_ColumnReferencePlaceholder.java | 4 +- .../shared/model/leaf/C_ConstantList.java | 4 +- .../shared/model/leaf/C_Leaf.java | 4 +- .../shared/model/leaf/TD_Value.java | 4 +- .../shared/model/logical/C_And.java | 4 +- .../shared/model/logical/C_Between.java | 4 +- .../shared/model/logical/C_IsNotNull.java | 4 +- .../shared/model/logical/C_IsNull.java | 4 +- .../shared/model/logical/C_Not.java | 4 +- .../shared/model/logical/C_Or.java | 4 +- .../shared/model/logical/C_ValueIsIn.java | 4 +- .../shared/replace/ReplaceType.java | 4 +- .../shared/replace/ReplaceTypeMap.java | 4 +- .../rule/RuleDescriptionDataProperties.java | 4 +- .../RuleDescriptionDataPropertiesCombo.java | 4 +- 142 files changed, 982 insertions(+), 1311 deletions(-) diff --git a/.classpath b/.classpath index 5b53453..865ccfe 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -32,5 +32,5 @@ - + diff --git a/distro/changelog.xml b/distro/changelog.xml index e40161a..eb93a20 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,8 @@ + + Support Java 8 compatibility [ticket #8580] + Updated to new PortalContext [ticket #6548] diff --git a/pom.xml b/pom.xml index 3ad184f..8d8f219 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ 4.0.0 org.gcube.portlets.user tabular-data-expression-widget - 1.9.0-SNAPSHOT + 1.10.0-SNAPSHOT tabular-data-expression-widget @@ -40,6 +40,8 @@ distro config + + 1.7 @@ -50,7 +52,7 @@ ${env.KEYS} - + UTF-8 UTF-8 @@ -115,7 +117,7 @@ compile - + org.gcube.data.analysis.tabulardata 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 index c5d7c0e..989a148 100644 --- 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 @@ -55,9 +55,8 @@ import com.sencha.gxt.widget.core.client.info.Info; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it - * + * @author Giancarlo Panichi + * */ public class ColumnExpressionPanel extends FramedPanel { private static final String RULE_DESCRIPTION_HEIGHT = "44px"; @@ -65,7 +64,7 @@ public class ColumnExpressionPanel extends FramedPanel { private static final String WIDTH = "658px"; private static final String HEIGHT = "364px"; private static final String RULE_HEIGHT = "388px"; - + private enum ColumnExpressionPanelType { ColumnFilter, RowDeleteByExpression, Template, RuleOnColumn; } @@ -99,12 +98,16 @@ public class ColumnExpressionPanel extends FramedPanel { /** * * @param parentFilterDialog + * parent * @param column + * column * @param columns + * list of column * @param eventBus + * event bus */ - public ColumnExpressionPanel(ColumnFilterDialog parentFilterDialog, - ColumnData column, ArrayList columns, EventBus eventBus) { + public ColumnExpressionPanel(ColumnFilterDialog parentFilterDialog, ColumnData column, + ArrayList columns, EventBus eventBus) { super(); setWidth(WIDTH); setHeight(HEIGHT); @@ -119,13 +122,16 @@ public class ColumnExpressionPanel extends FramedPanel { /** * * @param parentRowsDeleteByExpressionDialog + * parent * @param column + * column * @param columns + * list of column * @param eventBus + * event bus */ - public ColumnExpressionPanel( - RowsDeleteByExpressionDialog parentRowsDeleteByExpressionDialog, - ColumnData column, ArrayList columns, EventBus eventBus) { + public ColumnExpressionPanel(RowsDeleteByExpressionDialog parentRowsDeleteByExpressionDialog, ColumnData column, + ArrayList columns, EventBus eventBus) { super(); setWidth(WIDTH); setHeight(RULE_HEIGHT); @@ -140,12 +146,14 @@ public class ColumnExpressionPanel extends FramedPanel { /** * * @param parentColumnExpressionDialog + * parent * @param column + * column * @param eventBus + * event bus */ - public ColumnExpressionPanel( - TemplateColumnExpressionDialog parentColumnExpressionDialog, - ColumnData column, EventBus eventBus) { + public ColumnExpressionPanel(TemplateColumnExpressionDialog parentColumnExpressionDialog, ColumnData column, + EventBus eventBus) { super(); setWidth(WIDTH); setHeight(HEIGHT); @@ -161,10 +169,11 @@ public class ColumnExpressionPanel extends FramedPanel { /** * * @param parent + * parent * @param eventBus + * event bus */ - public ColumnExpressionPanel(RuleOnColumnCreateDialog parent, - EventBus eventBus) { + public ColumnExpressionPanel(RuleOnColumnCreateDialog parent, EventBus eventBus) { super(); setWidth(WIDTH); setHeight(HEIGHT); @@ -239,12 +248,9 @@ public class ColumnExpressionPanel extends FramedPanel { flowButton.add(btnClose, new BoxLayoutData(new Margins(2, 4, 2, 4))); - basicLayout.add(properties, new VerticalLayoutData(1, -1, - new Margins(1))); - basicLayout.add(conditionsField, new VerticalLayoutData(1, -1, - new Margins(1))); - basicLayout.add(flowButton, new VerticalLayoutData(1, 36, new Margins( - 5, 2, 5, 2))); + basicLayout.add(properties, new VerticalLayoutData(1, -1, new Margins(1))); + basicLayout.add(conditionsField, new VerticalLayoutData(1, -1, new Margins(1))); + basicLayout.add(flowButton, new VerticalLayoutData(1, 36, new Margins(5, 2, 5, 2))); add(basicLayout); if (initialRuleDescriptionData == null) { @@ -267,21 +273,16 @@ public class ColumnExpressionPanel extends FramedPanel { ruleDescription.setHeight(RULE_DESCRIPTION_HEIGHT); ruleDescription.setToolTip("Rule Description"); if (initialRuleDescriptionData != null) { - ruleDescription.setValue(initialRuleDescriptionData - .getDescription()); + ruleDescription.setValue(initialRuleDescriptionData.getDescription()); } - FieldLabel ruleDescriptionLabel = new FieldLabel(ruleDescription, - "Rule Description"); + FieldLabel ruleDescriptionLabel = new FieldLabel(ruleDescription, "Rule Description"); // comboDataType - ColumnDataTypeProperties propsDataType = GWT - .create(ColumnDataTypeProperties.class); - ListStore storeComboDataType = new ListStore( - propsDataType.id()); + ColumnDataTypeProperties propsDataType = GWT.create(ColumnDataTypeProperties.class); + ListStore storeComboDataType = new ListStore(propsDataType.id()); storeComboDataType.addAll(ColumnDataTypeStore.getAttributeType()); - comboDataType = new ComboBox(storeComboDataType, - propsDataType.label()); + comboDataType = new ComboBox(storeComboDataType, propsDataType.label()); Log.trace("ComboDataType created"); addHandlersForComboAttributeType(propsDataType.label()); @@ -292,13 +293,11 @@ public class ColumnExpressionPanel extends FramedPanel { comboDataType.setTriggerAction(TriggerAction.ALL); if (initialRuleDescriptionData != null) { - Log.debug("Initial RuleDescriptionData: " - + initialRuleDescriptionData); + Log.debug("Initial RuleDescriptionData: " + initialRuleDescriptionData); ColumnDataType cdt = retrieveColumnDataType(); if (cdt != null) { Log.debug("Retrieved column data type: " + cdt); - ColumnDataTypeElement cdte = ColumnDataTypeStore - .selectedAttributeElement(cdt); + ColumnDataTypeElement cdte = ColumnDataTypeStore.selectedAttributeElement(cdt); if (cdte != null) { comboDataType.setValue(cdte); @@ -310,19 +309,15 @@ public class ColumnExpressionPanel extends FramedPanel { comboDataTypeLabel = new FieldLabel(comboDataType, "Data Type"); - propertiesLayout.add(ruleNameLabel, new VerticalLayoutData(1, -1, - new Margins(0))); - propertiesLayout.add(ruleDescriptionLabel, new VerticalLayoutData(1, - -1, new Margins(0))); + propertiesLayout.add(ruleNameLabel, new VerticalLayoutData(1, -1, new Margins(0))); + propertiesLayout.add(ruleDescriptionLabel, new VerticalLayoutData(1, -1, new Margins(0))); - propertiesLayout.add(comboDataTypeLabel, new VerticalLayoutData(1, -1, - new Margins(0))); + propertiesLayout.add(comboDataTypeLabel, new VerticalLayoutData(1, -1, new Margins(0))); } private ColumnDataType retrieveColumnDataType() { - TDRuleType tdRuleColumnType = initialRuleDescriptionData - .getTdRuleType(); + TDRuleType tdRuleColumnType = initialRuleDescriptionData.getTdRuleType(); if (tdRuleColumnType instanceof TDBaseColumnRuleType) { TDBaseColumnRuleType tdBaseColumnRuleType = (TDBaseColumnRuleType) tdRuleColumnType; return tdBaseColumnRuleType.getColumnDataType(); @@ -332,27 +327,17 @@ public class ColumnExpressionPanel extends FramedPanel { } - protected void addHandlersForComboAttributeType( - final LabelProvider labelProvider) { - comboDataType - .addSelectionHandler(new SelectionHandler() { - public void onSelection( - SelectionEvent event) { - Info.display( - "Attribute Type Selected", - "You selected " - + (event.getSelectedItem() == null ? "nothing" - : labelProvider.getLabel(event - .getSelectedItem()) - + "!")); - Log.debug("ComboAttributeType selected: " - + event.getSelectedItem()); - ColumnDataTypeElement attributeType = event - .getSelectedItem(); - updateDataType(attributeType.getType()); - } + protected void addHandlersForComboAttributeType(final LabelProvider labelProvider) { + comboDataType.addSelectionHandler(new SelectionHandler() { + public void onSelection(SelectionEvent event) { + Info.display("Attribute Type Selected", "You selected " + (event.getSelectedItem() == null ? "nothing" + : labelProvider.getLabel(event.getSelectedItem()) + "!")); + Log.debug("ComboAttributeType selected: " + event.getSelectedItem()); + ColumnDataTypeElement attributeType = event.getSelectedItem(); + updateDataType(attributeType.getType()); + } - }); + }); } protected void updateCondition() { @@ -374,13 +359,11 @@ public class ColumnExpressionPanel extends FramedPanel { protected ColumnMockUp retrieveColumnMockUp() { ColumnMockUp columnMockUp = null; - ColumnDataTypeElement columnDataTypeElement = comboDataType - .getCurrentValue(); + ColumnDataTypeElement columnDataTypeElement = comboDataType.getCurrentValue(); if (columnDataTypeElement != null) { ColumnDataType dataType = columnDataTypeElement.getType(); if (dataType != null) { - columnMockUp = new ColumnMockUp(null, RULE_PLACE_HOLDER_ID, - dataType, RULE_PLACE_HOLDER_ID); + columnMockUp = new ColumnMockUp(null, RULE_PLACE_HOLDER_ID, dataType, RULE_PLACE_HOLDER_ID); } else { @@ -402,27 +385,21 @@ public class ColumnExpressionPanel extends FramedPanel { String ruleDescriptionS = ruleDescription.getCurrentValue(); if (ruleDescriptionS != null && !ruleDescriptionS.isEmpty()) { - ColumnDataTypeElement columnDataTypeElement = comboDataType - .getCurrentValue(); + ColumnDataTypeElement columnDataTypeElement = comboDataType.getCurrentValue(); if (columnDataTypeElement != null) { ColumnDataType dataType = columnDataTypeElement.getType(); if (dataType != null) { - columnMockUp = new ColumnMockUp(null, - RULE_PLACE_HOLDER_ID, dataType, - RULE_PLACE_HOLDER_ID); + columnMockUp = new ColumnMockUp(null, RULE_PLACE_HOLDER_ID, dataType, RULE_PLACE_HOLDER_ID); } else { - UtilsGXT3.alert("Attention", - "Column data type not selected!"); + UtilsGXT3.alert("Attention", "Column data type not selected!"); } } else { - UtilsGXT3.alert("Attention", - "Column data type not selected!"); + UtilsGXT3.alert("Attention", "Column data type not selected!"); } } else { - UtilsGXT3.alert("Attention", - "Enter a valid description for the rule!"); + UtilsGXT3.alert("Attention", "Enter a valid description for the rule!"); } } else { UtilsGXT3.alert("Attention", "Enter a valid name for the rule!"); @@ -437,12 +414,10 @@ public class ColumnExpressionPanel extends FramedPanel { if (exp != null) { String ruleNameS = ruleName.getCurrentValue(); String ruleDescriptionS = ruleDescription.getCurrentValue(); - TDBaseColumnRuleType tdBaseColumnRule = new TDBaseColumnRuleType( - columnMockUp.getColumnDataType()); + TDBaseColumnRuleType tdBaseColumnRule = new TDBaseColumnRuleType(columnMockUp.getColumnDataType()); - RuleDescriptionData ruleDescriptionData = new RuleDescriptionData( - 0, ruleNameS, ruleDescriptionS, new Date(), - null, null, RuleScopeType.COLUMN, exp, tdBaseColumnRule); + RuleDescriptionData ruleDescriptionData = new RuleDescriptionData(0, ruleNameS, ruleDescriptionS, + new Date(), null, null, RuleScopeType.COLUMN, exp, tdBaseColumnRule); return ruleDescriptionData; } else { UtilsGXT3.alert("Attention", "Enter a valid condition!"); @@ -488,15 +463,13 @@ public class ColumnExpressionPanel extends FramedPanel { columnType.setToolTip("The type of column"); columnType.setReadOnly(true); columnType.setValue(column.getTypeCode()); - propertiesLayout.add(new FieldLabel(columnType, "Column Type"), - new VerticalLayoutData(1, -1)); + propertiesLayout.add(new FieldLabel(columnType, "Column Type"), new VerticalLayoutData(1, -1)); TextField dataType = new TextField(); dataType.setToolTip("The data type"); dataType.setReadOnly(true); dataType.setValue(column.getDataTypeName()); - propertiesLayout.add(new FieldLabel(dataType, "Data Type"), - new VerticalLayoutData(1, -1)); + propertiesLayout.add(new FieldLabel(dataType, "Data Type"), new VerticalLayoutData(1, -1)); conditionsField = new FieldSet(); conditionsField.setHeadingText("Conditions"); @@ -535,12 +508,9 @@ public class ColumnExpressionPanel extends FramedPanel { flowButton.add(btnClose, new BoxLayoutData(new Margins(2, 4, 2, 4))); - basicLayout.add(properties, new VerticalLayoutData(1, -1, - new Margins(1))); - basicLayout.add(conditionsField, new VerticalLayoutData(1, -1, - new Margins(1))); - basicLayout.add(flowButton, new VerticalLayoutData(1, 36, new Margins( - 5, 2, 5, 2))); + basicLayout.add(properties, new VerticalLayoutData(1, -1, new Margins(1))); + basicLayout.add(conditionsField, new VerticalLayoutData(1, -1, new Margins(1))); + basicLayout.add(flowButton, new VerticalLayoutData(1, 36, new Margins(5, 2, 5, 2))); add(basicLayout); } @@ -569,11 +539,9 @@ public class ColumnExpressionPanel extends FramedPanel { properties.add(propertiesLayout); // Combo Column - ColumnDataPropertiesCombo propsCols = GWT - .create(ColumnDataPropertiesCombo.class); + ColumnDataPropertiesCombo propsCols = GWT.create(ColumnDataPropertiesCombo.class); Log.debug("Props: " + propsCols); - final ListStore storeCols = new ListStore( - propsCols.id()); + final ListStore storeCols = new ListStore(propsCols.id()); Log.debug("Store Col: " + storeCols); storeCols.addAll(columns); @@ -590,8 +558,7 @@ public class ColumnExpressionPanel extends FramedPanel { setSelectedColumn(); - propertiesLayout.add(new FieldLabel(comboCols, "Column"), - new VerticalLayoutData(1, -1)); + propertiesLayout.add(new FieldLabel(comboCols, "Column"), new VerticalLayoutData(1, -1)); // conditionsField = new FieldSet(); @@ -632,12 +599,9 @@ public class ColumnExpressionPanel extends FramedPanel { flowButton.add(btnApply, new BoxLayoutData(new Margins(2, 4, 2, 4))); flowButton.add(btnClose, new BoxLayoutData(new Margins(2, 4, 2, 4))); - basicLayout.add(properties, new VerticalLayoutData(1, -1, - new Margins(1))); - basicLayout.add(conditionsField, new VerticalLayoutData(1, -1, - new Margins(1))); - basicLayout.add(flowButton, new VerticalLayoutData(1, 36, new Margins( - 5, 2, 5, 2))); + basicLayout.add(properties, new VerticalLayoutData(1, -1, new Margins(1))); + basicLayout.add(conditionsField, new VerticalLayoutData(1, -1, new Margins(1))); + basicLayout.add(flowButton, new VerticalLayoutData(1, 36, new Margins(5, 2, 5, 2))); add(basicLayout); @@ -667,11 +631,9 @@ public class ColumnExpressionPanel extends FramedPanel { properties.add(propertiesLayout); // Combo Column - ColumnDataPropertiesCombo propsCols = GWT - .create(ColumnDataPropertiesCombo.class); + ColumnDataPropertiesCombo propsCols = GWT.create(ColumnDataPropertiesCombo.class); Log.debug("Props: " + propsCols); - final ListStore storeCols = new ListStore( - propsCols.id()); + final ListStore storeCols = new ListStore(propsCols.id()); Log.debug("Store Col: " + storeCols); storeCols.addAll(columns); @@ -688,8 +650,7 @@ public class ColumnExpressionPanel extends FramedPanel { setSelectedColumn(); - propertiesLayout.add(new FieldLabel(comboCols, "Column"), - new VerticalLayoutData(1, -1)); + propertiesLayout.add(new FieldLabel(comboCols, "Column"), new VerticalLayoutData(1, -1)); // conditionsField = new FieldSet(); @@ -701,8 +662,7 @@ public class ColumnExpressionPanel extends FramedPanel { conditionsField.add(conditionWidget); btnApply = new TextButton("Delete"); - btnApply.setIcon(ExpressionResources.INSTANCE - .tableRowDeleteByExpression()); + btnApply.setIcon(ExpressionResources.INSTANCE.tableRowDeleteByExpression()); btnApply.setIconAlign(IconAlign.RIGHT); btnApply.setToolTip("Delete rows"); btnApply.addSelectHandler(new SelectHandler() { @@ -731,12 +691,9 @@ public class ColumnExpressionPanel extends FramedPanel { flowButton.add(btnApply, new BoxLayoutData(new Margins(2, 4, 2, 4))); flowButton.add(btnClose, new BoxLayoutData(new Margins(2, 4, 2, 4))); - basicLayout.add(properties, new VerticalLayoutData(1, -1, - new Margins(1))); - basicLayout.add(conditionsField, new VerticalLayoutData(1, -1, - new Margins(1))); - basicLayout.add(flowButton, new VerticalLayoutData(1, 36, new Margins( - 5, 2, 5, 2))); + basicLayout.add(properties, new VerticalLayoutData(1, -1, new Margins(1))); + basicLayout.add(conditionsField, new VerticalLayoutData(1, -1, new Margins(1))); + basicLayout.add(flowButton, new VerticalLayoutData(1, 36, new Margins(5, 2, 5, 2))); add(basicLayout); @@ -746,14 +703,11 @@ public class ColumnExpressionPanel extends FramedPanel { if (column == null) { } else { - ColumnTypeCode typeCode = ColumnTypeCode - .getColumnTypeCodeFromId(column.getTypeCode()); + ColumnTypeCode typeCode = ColumnTypeCode.getColumnTypeCodeFromId(column.getTypeCode()); HTML errorMessage; if (typeCode == null) { - errorMessage = new HTML( - "This column has column data type null!"); - UtilsGXT3.alert("Error", - "This column has column data type null!!"); + errorMessage = new HTML("This column has column data type null!"); + UtilsGXT3.alert("Error", "This column has column data type null!!"); return; } @@ -768,18 +722,14 @@ public class ColumnExpressionPanel extends FramedPanel { break; case DIMENSION: case TIMEDIMENSION: - errorMessage = new HTML( - "This type of column is not supported for now!"); + errorMessage = new HTML("This type of column is not supported for now!"); add(errorMessage); - UtilsGXT3.alert("Error", - "This type of column is not supported for now!"); + UtilsGXT3.alert("Error", "This type of column is not supported for now!"); break; default: - errorMessage = new HTML( - "This type of column is not supported for now!"); + errorMessage = new HTML("This type of column is not supported for now!"); add(errorMessage); - UtilsGXT3.alert("Error", - "This type of column is not supported for now!"); + UtilsGXT3.alert("Error", "This type of column is not supported for now!"); break; } @@ -838,8 +788,7 @@ public class ColumnExpressionPanel extends FramedPanel { columnName.setToolTip("Column"); columnName.setReadOnly(true); columnName.setValue(column.getLabel()); - propertiesLayout.add(new FieldLabel(columnName, "Column"), - new VerticalLayoutData(1, -1)); + propertiesLayout.add(new FieldLabel(columnName, "Column"), new VerticalLayoutData(1, -1)); conditionsField = new FieldSet(); conditionsField.setHeadingText("Conditions"); @@ -864,12 +813,9 @@ public class ColumnExpressionPanel extends FramedPanel { flowButton.add(btnApply, new BoxLayoutData(new Margins(2, 4, 2, 4))); - basicLayout.add(properties, new VerticalLayoutData(1, -1, - new Margins(1))); - basicLayout.add(conditionsField, new VerticalLayoutData(1, -1, - new Margins(1))); - basicLayout.add(flowButton, new VerticalLayoutData(1, 36, new Margins( - 5, 2, 5, 2))); + basicLayout.add(properties, new VerticalLayoutData(1, -1, new Margins(1))); + basicLayout.add(conditionsField, new VerticalLayoutData(1, -1, new Margins(1))); + basicLayout.add(flowButton, new VerticalLayoutData(1, 36, new Margins(5, 2, 5, 2))); add(basicLayout); } @@ -893,11 +839,9 @@ public class ColumnExpressionPanel extends FramedPanel { condContainer = new C_ExpressionContainer(); condContainer.setId(C_ExpressionContainer.Contains.C_Expression); condContainer.setExp(exp); - exWrapper = new ExpressionWrapper(column.getTrId(), column, - condContainer); + exWrapper = new ExpressionWrapper(column.getTrId(), column, condContainer); - ExpressionWrapperNotification expressionWrapperNotification = new ExpressionWrapperNotification( - exWrapper); + ExpressionWrapperNotification expressionWrapperNotification = new ExpressionWrapperNotification(exWrapper); Log.debug("Notification: " + expressionWrapperNotification); parentTemplateDialog.onExpression(expressionWrapperNotification); break; @@ -937,8 +881,7 @@ public class ColumnExpressionPanel extends FramedPanel { return; } C_Expression notExp = new C_Not(exp); - parentRowsDeleteByExpressionDialog.deleteRowsByExpression(column, - notExp); + parentRowsDeleteByExpressionDialog.deleteRowsByExpression(column, notExp); break; diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnFilterDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnFilterDialog.java index 8479a17..4b78e49 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnFilterDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnFilterDialog.java @@ -32,8 +32,8 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ColumnFilterDialog extends Window implements MonitorDialogListener { 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 02aeb3d..20e999e 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 @@ -19,8 +19,8 @@ import com.sencha.gxt.widget.core.client.container.Viewport; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ExpressionWidgetEntry implements EntryPoint { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/MultiColumnExpressionPanel.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/MultiColumnExpressionPanel.java index 0f9cf8c..891393e 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/MultiColumnExpressionPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/MultiColumnExpressionPanel.java @@ -47,8 +47,8 @@ import com.sencha.gxt.widget.core.client.form.validator.EmptyValidator; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MultiColumnExpressionPanel extends FramedPanel { @@ -66,7 +66,6 @@ public class MultiColumnExpressionPanel extends FramedPanel { private static final String RULE_DESCRIPTION_HEIGHT = "44px"; - private enum MultiColumnExpressionPanelType { ColumnFilter, RowDeleteByExpression, Template, RuleOnTable; } @@ -96,12 +95,14 @@ public class MultiColumnExpressionPanel extends FramedPanel { /** * * @param parent - * @param columncreateOnRule + * parent * @param columns + * list of column * @param eventBus + * event bus */ - public MultiColumnExpressionPanel(MultiColumnFilterDialog parent, - ArrayList columns, EventBus eventBus) { + public MultiColumnExpressionPanel(MultiColumnFilterDialog parent, ArrayList columns, + EventBus eventBus) { super(); setWidth(WIDTH); setHeight(HEIGHT); @@ -114,13 +115,14 @@ public class MultiColumnExpressionPanel extends FramedPanel { /** * * @param parent - * @param column + * Parent * @param columns + * List of column * @param eventBus + * Event bus */ - public MultiColumnExpressionPanel( - RowsDeleteByMultiColumnExpressionDialog parent, - ArrayList columns, EventBus eventBus) { + public MultiColumnExpressionPanel(RowsDeleteByMultiColumnExpressionDialog parent, ArrayList columns, + EventBus eventBus) { super(); setWidth(WIDTH); setHeight(ROWS_DELETE_HEIGHT); @@ -133,12 +135,14 @@ public class MultiColumnExpressionPanel extends FramedPanel { /** * * @param parent - * @param column + * parent + * @param columns + * list of column * @param eventBus + * event bus */ - public MultiColumnExpressionPanel( - TemplateMultiColumnExpressionDialog parent, - ArrayList columns, EventBus eventBus) { + public MultiColumnExpressionPanel(TemplateMultiColumnExpressionDialog parent, ArrayList columns, + EventBus eventBus) { super(); setWidth(WIDTH); setHeight(HEIGHT); @@ -151,10 +155,13 @@ public class MultiColumnExpressionPanel extends FramedPanel { /** * * @param parent - * @param eventBus + * parent + * @param initialRuleDescriptionData + * initial rule description + * @throws MultiColumnExpressionPanelException + * exception */ - public MultiColumnExpressionPanel(RuleOnTableCreateDialog parent, - RuleDescriptionData initialRuleDescriptionData) + public MultiColumnExpressionPanel(RuleOnTableCreateDialog parent, RuleDescriptionData initialRuleDescriptionData) throws MultiColumnExpressionPanelException { super(); Log.debug("MultiColumnExpressionPanel"); @@ -169,15 +176,13 @@ public class MultiColumnExpressionPanel extends FramedPanel { protected void retrieveColumns() throws MultiColumnExpressionPanelException { if (initialRuleDescriptionData == null) { Log.error("No rules description data present!"); - throw new MultiColumnExpressionPanelException( - "No rules description data present!"); + throw new MultiColumnExpressionPanelException("No rules description data present!"); } TDRuleType tdRuleType = initialRuleDescriptionData.getTdRuleType(); if (tdRuleType == null) { Log.error("No Rule Type present!"); - throw new MultiColumnExpressionPanelException( - "No Rule Type present!"); + throw new MultiColumnExpressionPanelException("No Rule Type present!"); } if (tdRuleType instanceof TDRuleTableType) { @@ -190,8 +195,7 @@ public class MultiColumnExpressionPanel extends FramedPanel { col.setId(ruleColumnPlaceHolderDescriptor.getId()); col.setColumnId(ruleColumnPlaceHolderDescriptor.getLabel()); col.setLabel(ruleColumnPlaceHolderDescriptor.getLabel()); - col.setDataTypeName(ruleColumnPlaceHolderDescriptor - .getColumnDataType().getId()); + col.setDataTypeName(ruleColumnPlaceHolderDescriptor.getColumnDataType().getId()); columns.add(col); } @@ -199,8 +203,7 @@ public class MultiColumnExpressionPanel extends FramedPanel { } else { Log.error("No Table Rule Type present!"); - throw new MultiColumnExpressionPanelException( - "No Table Rule Type present!"); + throw new MultiColumnExpressionPanelException("No Table Rule Type present!"); } } @@ -224,8 +227,8 @@ public class MultiColumnExpressionPanel extends FramedPanel { conditionsField.setCollapsible(false); conditionsField.setWidth(RULE_CONDITION_FIELD_WIDTH); - conditionWidget = new ConditionOnMultiColumnWidget(columns, - RULE_MULTI_CONDITION_WIDTH, RULE_MULTI_CONDITION_HEIGHT); + conditionWidget = new ConditionOnMultiColumnWidget(columns, RULE_MULTI_CONDITION_WIDTH, + RULE_MULTI_CONDITION_HEIGHT); conditionsField.add(conditionWidget); HBoxLayoutContainer flowButton = new HBoxLayoutContainer(); @@ -257,24 +260,19 @@ public class MultiColumnExpressionPanel extends FramedPanel { } }); - flowButton - .add(btnApply, new BoxLayoutData(new Margins(2, 4, 2, 4))); + flowButton.add(btnApply, new BoxLayoutData(new Margins(2, 4, 2, 4))); - flowButton - .add(btnClose, new BoxLayoutData(new Margins(2, 4, 2, 4))); + flowButton.add(btnClose, new BoxLayoutData(new Margins(2, 4, 2, 4))); VerticalLayoutContainer basicLayout = new VerticalLayoutContainer(); // basicLayout.setAdjustForScroll(true); - basicLayout.add(propertiesField, new VerticalLayoutData(1, -1, - new Margins(1))); + basicLayout.add(propertiesField, new VerticalLayoutData(1, -1, new Margins(1))); - basicLayout.add(conditionsField, new VerticalLayoutData(-1, -1, - new Margins(1))); + basicLayout.add(conditionsField, new VerticalLayoutData(-1, -1, new Margins(1))); if (parentRuleOnTableCreateDialog != null) { - basicLayout.add(flowButton, new VerticalLayoutData(1, 36, - new Margins(5, 2, 5, 2))); + basicLayout.add(flowButton, new VerticalLayoutData(1, 36, new Margins(5, 2, 5, 2))); } add(basicLayout); @@ -293,8 +291,7 @@ public class MultiColumnExpressionPanel extends FramedPanel { } } - private void createRuleOnTableDecription( - VerticalLayoutContainer propertiesLayout) { + private void createRuleOnTableDecription(VerticalLayoutContainer propertiesLayout) { ruleName = new TextField(); ruleName.addValidator(new EmptyValidator()); ruleName.setToolTip("Rule Name"); @@ -308,16 +305,12 @@ public class MultiColumnExpressionPanel extends FramedPanel { ruleDescription.setHeight(RULE_DESCRIPTION_HEIGHT); ruleDescription.setToolTip("Rule Description"); if (initialRuleDescriptionData != null) { - ruleDescription.setValue(initialRuleDescriptionData - .getDescription()); + ruleDescription.setValue(initialRuleDescriptionData.getDescription()); } - FieldLabel ruleDescriptionLabel = new FieldLabel(ruleDescription, - "Rule Description"); + FieldLabel ruleDescriptionLabel = new FieldLabel(ruleDescription, "Rule Description"); - propertiesLayout.add(ruleNameLabel, new VerticalLayoutData(1, -1, - new Margins(0))); - propertiesLayout.add(ruleDescriptionLabel, new VerticalLayoutData(1, - -1, new Margins(0))); + propertiesLayout.add(ruleNameLabel, new VerticalLayoutData(1, -1, new Margins(0))); + propertiesLayout.add(ruleDescriptionLabel, new VerticalLayoutData(1, -1, new Margins(0))); } @@ -328,22 +321,18 @@ public class MultiColumnExpressionPanel extends FramedPanel { if (exp != null) { String ruleNameS = ruleName.getCurrentValue(); String ruleDescriptionS = ruleDescription.getCurrentValue(); - RuleDescriptionData ruleDescriptionData = new RuleDescriptionData( - 0, ruleNameS, ruleDescriptionS, new Date(), null, - null, RuleScopeType.TABLE, exp, + RuleDescriptionData ruleDescriptionData = new RuleDescriptionData(0, ruleNameS, ruleDescriptionS, + new Date(), null, null, RuleScopeType.TABLE, exp, initialRuleDescriptionData.getTdRuleType()); return ruleDescriptionData; } else { - throw new MultiColumnExpressionPanelException( - "Enter a valid condition!"); + throw new MultiColumnExpressionPanelException("Enter a valid condition!"); } } else { - throw new MultiColumnExpressionPanelException( - "Enter a valid description for the rule!"); + throw new MultiColumnExpressionPanelException("Enter a valid description for the rule!"); } } else { - throw new MultiColumnExpressionPanelException( - "Enter a valid name for the rule!"); + throw new MultiColumnExpressionPanelException("Enter a valid name for the rule!"); } } @@ -401,10 +390,8 @@ public class MultiColumnExpressionPanel extends FramedPanel { // basicLayout.setAdjustForScroll(true); // basicLayout.setScrollMode(ScrollMode.AUTO); Set In GXT 3.0.1 - basicLayout.add(conditionsField, new VerticalLayoutData(-1, -1, - new Margins(1))); - basicLayout.add(flowButton, new VerticalLayoutData(1, 36, new Margins( - 5, 2, 5, 2))); + basicLayout.add(conditionsField, new VerticalLayoutData(-1, -1, new Margins(1))); + basicLayout.add(flowButton, new VerticalLayoutData(1, 36, new Margins(5, 2, 5, 2))); add(basicLayout); } @@ -456,10 +443,8 @@ public class MultiColumnExpressionPanel extends FramedPanel { VerticalLayoutContainer basicLayout = new VerticalLayoutContainer(); // basicLayout.setAdjustForScroll(true); - basicLayout.add(conditionsField, new VerticalLayoutData(-1, -1, - new Margins(0))); - basicLayout.add(flowButton, new VerticalLayoutData(1, 36, new Margins( - 5, 2, 5, 2))); + basicLayout.add(conditionsField, new VerticalLayoutData(-1, -1, new Margins(0))); + basicLayout.add(flowButton, new VerticalLayoutData(1, 36, new Margins(5, 2, 5, 2))); add(basicLayout); @@ -485,8 +470,7 @@ public class MultiColumnExpressionPanel extends FramedPanel { conditionsField.add(conditionWidget); btnApply = new TextButton("Delete"); - btnApply.setIcon(ExpressionResources.INSTANCE - .tableRowDeleteByExpression()); + btnApply.setIcon(ExpressionResources.INSTANCE.tableRowDeleteByExpression()); btnApply.setIconAlign(IconAlign.RIGHT); btnApply.setToolTip("Delete rows"); btnApply.addSelectHandler(new SelectHandler() { @@ -514,10 +498,8 @@ public class MultiColumnExpressionPanel extends FramedPanel { VerticalLayoutContainer basicLayout = new VerticalLayoutContainer(); - basicLayout.add(conditionsField, new VerticalLayoutData(-1, -1, - new Margins(1))); - basicLayout.add(flowButton, new VerticalLayoutData(1, 36, new Margins( - 5, 2, 5, 2))); + basicLayout.add(conditionsField, new VerticalLayoutData(-1, -1, new Margins(1))); + basicLayout.add(flowButton, new VerticalLayoutData(1, 36, new Margins(5, 2, 5, 2))); add(basicLayout); @@ -527,14 +509,11 @@ public class MultiColumnExpressionPanel extends FramedPanel { if (column == null) { } else { - ColumnTypeCode typeCode = ColumnTypeCode - .getColumnTypeCodeFromId(column.getTypeCode()); + ColumnTypeCode typeCode = ColumnTypeCode.getColumnTypeCodeFromId(column.getTypeCode()); HTML errorMessage; if (typeCode == null) { - errorMessage = new HTML( - "This column has column data type null!"); - UtilsGXT3.alert("Error", - "This column has column data type null!!"); + errorMessage = new HTML("This column has column data type null!"); + UtilsGXT3.alert("Error", "This column has column data type null!!"); return; } @@ -549,18 +528,14 @@ public class MultiColumnExpressionPanel extends FramedPanel { break; case DIMENSION: case TIMEDIMENSION: - errorMessage = new HTML( - "This type of column is not supported for now!"); + errorMessage = new HTML("This type of column is not supported for now!"); add(errorMessage); - UtilsGXT3.alert("Error", - "This type of column is not supported for now!"); + UtilsGXT3.alert("Error", "This type of column is not supported for now!"); break; default: - errorMessage = new HTML( - "This type of column is not supported for now!"); + errorMessage = new HTML("This type of column is not supported for now!"); add(errorMessage); - UtilsGXT3.alert("Error", - "This type of column is not supported for now!"); + UtilsGXT3.alert("Error", "This type of column is not supported for now!"); break; } @@ -609,8 +584,7 @@ public class MultiColumnExpressionPanel extends FramedPanel { condContainer.setExp(exp); exWrapper = new ExpressionWrapper(null, null, condContainer); - ExpressionWrapperNotification expressionWrapperNotification = new ExpressionWrapperNotification( - exWrapper); + ExpressionWrapperNotification expressionWrapperNotification = new ExpressionWrapperNotification(exWrapper); Log.debug("Apply: " + expressionWrapperNotification); parentTemplateDialog.onExpression(expressionWrapperNotification); break; @@ -672,8 +646,7 @@ public class MultiColumnExpressionPanel extends FramedPanel { } - public RuleDescriptionData getRuleOnTable() - throws MultiColumnExpressionPanelException { + public RuleDescriptionData getRuleOnTable() throws MultiColumnExpressionPanelException { if (!conditionWidget.isEnabled()) { throw new MultiColumnExpressionPanelException("Fill all field!"); } @@ -684,8 +657,7 @@ public class MultiColumnExpressionPanel extends FramedPanel { exp = conditionWidget.getExpression(); } catch (ConditionTypeMapException e) { Log.debug(e.getLocalizedMessage()); - throw new MultiColumnExpressionPanelException( - e.getLocalizedMessage()); + throw new MultiColumnExpressionPanelException(e.getLocalizedMessage()); } RuleDescriptionData ruleDescriptionData = retrieveRuleDescriptionData(exp); return ruleDescriptionData; diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/MultiColumnFilterDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/MultiColumnFilterDialog.java index 0757b21..dd05e47 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/MultiColumnFilterDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/MultiColumnFilterDialog.java @@ -32,8 +32,8 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MultiColumnFilterDialog extends Window implements MonitorDialogListener { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionDialog.java index 3fa5c45..afe7fbf 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionDialog.java @@ -34,12 +34,11 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ -public class ReplaceColumnByExpressionDialog extends Window implements - MonitorDialogListener { +public class ReplaceColumnByExpressionDialog extends Window implements MonitorDialogListener { private static final String WIDTH = "900px"; private static final String HEIGHT = "490px"; // private static final String HEIGHT_REDUCE = "404px"; @@ -58,13 +57,16 @@ public class ReplaceColumnByExpressionDialog extends Window implements * * Columns must have set columnId, label, columnTypeCode and ColumnDataType * - * @param column - * The column selected - * @param columns + * + * @param columnMockUp + * column mockup + * @param columnMockUpList + * columns mockup list * @param eventBus + * event bus */ - public ReplaceColumnByExpressionDialog(ColumnMockUp columnMockUp, - ArrayList columnMockUpList, EventBus eventBus) { + public ReplaceColumnByExpressionDialog(ColumnMockUp columnMockUp, ArrayList columnMockUpList, + EventBus eventBus) { this.eventBus = eventBus; column = new ColumnData(); column.setColumnId(columnMockUp.getColumnId()); @@ -92,15 +94,17 @@ public class ReplaceColumnByExpressionDialog extends Window implements /** * * @param trId - * @param columnName + * tabular resource id + * @param columnId + * column id * @param eventBus + * event bus */ - public ReplaceColumnByExpressionDialog(TRId trId, String columnId, - EventBus eventBus) { + public ReplaceColumnByExpressionDialog(TRId trId, String columnId, EventBus eventBus) { this.eventBus = eventBus; this.trId = trId; if (columnId == null) { - column=null; + column = null; } else { column = new ColumnData(); column.setColumnId(columnId); @@ -119,14 +123,11 @@ public class ReplaceColumnByExpressionDialog extends Window implements setResizable(false); setHeadingText("Replace Column By Expression"); setClosable(true); - getHeader().setIcon( - ExpressionResources.INSTANCE.columnReplaceByExpression()); + getHeader().setIcon(ExpressionResources.INSTANCE.columnReplaceByExpression()); } - /** - * {@inheritDoc} - */ + @Override protected void initTools() { super.initTools(); @@ -141,8 +142,8 @@ public class ReplaceColumnByExpressionDialog extends Window implements } protected void create() { - replaceColumnByExpressionPanel = new ReplaceColumnByExpressionPanel( - this, column, columns, eventBus, replaceExpressionType); + replaceColumnByExpressionPanel = new ReplaceColumnByExpressionPanel(this, column, columns, eventBus, + replaceExpressionType); add(replaceColumnByExpressionPanel); } @@ -155,59 +156,52 @@ public class ReplaceColumnByExpressionDialog extends Window implements this.cConditionExpression = exp; } - protected void applyReplaceColumnByExpression(ColumnData column, - boolean allRows, C_Expression cConditionExpression, + protected void applyReplaceColumnByExpression(ColumnData column, boolean allRows, C_Expression cConditionExpression, String replaceValue) { this.column = column; this.cConditionExpression = cConditionExpression; - ReplaceColumnByExpressionSession replaceColumnByExpressionSession = new ReplaceColumnByExpressionSession( - column, allRows, cConditionExpression, replaceValue); + ReplaceColumnByExpressionSession replaceColumnByExpressionSession = new ReplaceColumnByExpressionSession(column, + allRows, cConditionExpression, replaceValue); callApplyReplaceByExpression(replaceColumnByExpressionSession); } - protected void applyReplaceColumnByExpression(ColumnData column, - boolean allRows, C_Expression cConditionExpression, + protected void applyReplaceColumnByExpression(ColumnData column, boolean allRows, C_Expression cConditionExpression, C_Expression cReplaceExpression) { this.column = column; this.cConditionExpression = cConditionExpression; - ReplaceColumnByExpressionSession replaceColumnByExpressionSession = new ReplaceColumnByExpressionSession( - column, allRows, cConditionExpression, cReplaceExpression); + ReplaceColumnByExpressionSession replaceColumnByExpressionSession = new ReplaceColumnByExpressionSession(column, + allRows, cConditionExpression, cReplaceExpression); callApplyReplaceByExpression(replaceColumnByExpressionSession); } protected void load() { - TDGWTServiceAsync.INSTANCE.getColumns(trId, - new AsyncCallback>() { + TDGWTServiceAsync.INSTANCE.getColumns(trId, new AsyncCallback>() { - public void onFailure(Throwable caught) { - if (caught instanceof TDGWTSessionExpiredException) { - eventBus.fireEvent(new SessionExpiredEvent( - SessionExpiredType.EXPIREDONSERVER)); - } else { - if (caught instanceof TDGWTIsLockedException) { - Log.error(caught.getLocalizedMessage()); - UtilsGXT3.alert("Error Locked", - caught.getLocalizedMessage()); - } else { - Log.error("Error retrieving column: " - + caught.getMessage()); - UtilsGXT3.alert("Error retrieving column", - caught.getMessage()); - } - } + public void onFailure(Throwable caught) { + if (caught instanceof TDGWTSessionExpiredException) { + eventBus.fireEvent(new SessionExpiredEvent(SessionExpiredType.EXPIREDONSERVER)); + } else { + if (caught instanceof TDGWTIsLockedException) { + Log.error(caught.getLocalizedMessage()); + UtilsGXT3.alert("Error Locked", caught.getLocalizedMessage()); + } else { + Log.error("Error retrieving column: " + caught.getMessage()); + UtilsGXT3.alert("Error retrieving column", caught.getMessage()); } + } + } - public void onSuccess(ArrayList result) { - Log.debug("Retrived columns: " + result); - columns = result; - sanitizesColumns(); - create(); + public void onSuccess(ArrayList result) { + Log.debug("Retrived columns: " + result); + columns = result; + sanitizesColumns(); + create(); - } + } - }); + }); } @@ -215,14 +209,11 @@ public class ReplaceColumnByExpressionDialog extends Window implements ArrayList removableColumn = new ArrayList(); for (ColumnData c : columns) { if (c.getTypeCode().compareTo(ColumnTypeCode.DIMENSION.toString()) == 0 - || c.getTypeCode().compareTo( - ColumnTypeCode.TIMEDIMENSION.toString()) == 0) { + || c.getTypeCode().compareTo(ColumnTypeCode.TIMEDIMENSION.toString()) == 0) { removableColumn.add(c); } else { - if (c.getColumnId() != null && column != null - && column.getColumnId() != null - && !column.getColumnId().isEmpty() - && c.getColumnId().compareTo(column.getColumnId()) == 0) { + if (c.getColumnId() != null && column != null && column.getColumnId() != null + && !column.getColumnId().isEmpty() && c.getColumnId().compareTo(column.getColumnId()) == 0) { column = c; } } @@ -230,13 +221,11 @@ public class ReplaceColumnByExpressionDialog extends Window implements columns.removeAll(removableColumn); } - protected void callApplyReplaceByExpression( - ReplaceColumnByExpressionSession replaceColumnByExpressionSession) { - Log.debug("Replace Column By Expression Session " - + replaceColumnByExpressionSession); + protected void callApplyReplaceByExpression(ReplaceColumnByExpressionSession replaceColumnByExpressionSession) { + Log.debug("Replace Column By Expression Session " + replaceColumnByExpressionSession); - ExpressionServiceAsync.INSTANCE.startReplaceColumnByExpression( - replaceColumnByExpressionSession, new AsyncCallback() { + ExpressionServiceAsync.INSTANCE.startReplaceColumnByExpression(replaceColumnByExpressionSession, + new AsyncCallback() { @Override public void onSuccess(String taskId) { @@ -248,25 +237,21 @@ public class ReplaceColumnByExpressionDialog extends Window implements @Override public void onFailure(Throwable caught) { if (caught instanceof TDGWTSessionExpiredException) { - eventBus.fireEvent(new SessionExpiredEvent( - SessionExpiredType.EXPIREDONSERVER)); + eventBus.fireEvent(new SessionExpiredEvent(SessionExpiredType.EXPIREDONSERVER)); } else { if (caught instanceof TDGWTIsLockedException) { Log.error(caught.getLocalizedMessage()); - UtilsGXT3.alert("Error Locked", - caught.getLocalizedMessage()); + UtilsGXT3.alert("Error Locked", caught.getLocalizedMessage()); } else { if (caught instanceof TDGWTIsFinalException) { Log.error(caught.getLocalizedMessage()); - UtilsGXT3.alert("Error Final", - caught.getLocalizedMessage()); + UtilsGXT3.alert("Error Final", caught.getLocalizedMessage()); } else { Log.error("Error submitting replace column by expression: " + caught.getLocalizedMessage()); caught.printStackTrace(); - UtilsGXT3 - .alert("Error submitting replace column by expression", - caught.getLocalizedMessage()); + UtilsGXT3.alert("Error submitting replace column by expression", + caught.getLocalizedMessage()); } } } @@ -291,8 +276,7 @@ public class ReplaceColumnByExpressionDialog extends Window implements public void operationComplete(OperationResult operationResult) { ChangeTableWhy why = ChangeTableWhy.TABLEUPDATED; ChangeTableRequestEvent changeTableRequestEvent = new ChangeTableRequestEvent( - ChangeTableRequestType.COLUMNFILTER, operationResult.getTrId(), - why); + ChangeTableRequestType.COLUMNFILTER, operationResult.getTrId(), why); eventBus.fireEvent(changeTableRequestEvent); close(); } @@ -305,12 +289,10 @@ public class ReplaceColumnByExpressionDialog extends Window implements } @Override - public void operationStopped(OperationResult operationResult, - String reason, String details) { + public void operationStopped(OperationResult operationResult, String reason, String details) { ChangeTableWhy why = ChangeTableWhy.TABLECURATION; ChangeTableRequestEvent changeTableRequestEvent = new ChangeTableRequestEvent( - ChangeTableRequestType.COLUMNFILTER, operationResult.getTrId(), - why); + ChangeTableRequestType.COLUMNFILTER, operationResult.getTrId(), why); eventBus.fireEvent(changeTableRequestEvent); close(); diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionPanel.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionPanel.java index ec41de0..6230934 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionPanel.java @@ -57,8 +57,8 @@ import com.sencha.gxt.widget.core.client.form.TextField; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ReplaceColumnByExpressionPanel extends FramedPanel { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByMultiColumnExpressionDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByMultiColumnExpressionDialog.java index ac43152..22754c9 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByMultiColumnExpressionDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByMultiColumnExpressionDialog.java @@ -34,12 +34,11 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ -public class ReplaceColumnByMultiColumnExpressionDialog extends Window implements - MonitorDialogListener { +public class ReplaceColumnByMultiColumnExpressionDialog extends Window implements MonitorDialogListener { private static final String WIDTH = "950px"; private static final String HEIGHT = "490px"; // private static final String HEIGHT_REDUCE = "404px"; @@ -58,10 +57,12 @@ public class ReplaceColumnByMultiColumnExpressionDialog extends Window implement * * Columns must have set columnId, label, columnTypeCode and ColumnDataType * - * @param column - * The column selected - * @param columns + * @param columnMockUp + * Column mockup + * @param columnMockUpList + * List of column mockup * @param eventBus + * Event bus */ public ReplaceColumnByMultiColumnExpressionDialog(ColumnMockUp columnMockUp, ArrayList columnMockUpList, EventBus eventBus) { @@ -92,15 +93,17 @@ public class ReplaceColumnByMultiColumnExpressionDialog extends Window implement /** * * @param trId - * @param columnName + * Tabular Resource id + * @param columnId + * Column id * @param eventBus + * Event bus */ - public ReplaceColumnByMultiColumnExpressionDialog(TRId trId, String columnId, - EventBus eventBus) { + public ReplaceColumnByMultiColumnExpressionDialog(TRId trId, String columnId, EventBus eventBus) { this.eventBus = eventBus; this.trId = trId; if (columnId == null) { - column=null; + column = null; } else { column = new ColumnData(); column.setColumnId(columnId); @@ -119,8 +122,7 @@ public class ReplaceColumnByMultiColumnExpressionDialog extends Window implement setResizable(false); setHeadingText("Replace Column By Expression"); setClosable(true); - getHeader().setIcon( - ExpressionResources.INSTANCE.columnReplaceByExpression()); + getHeader().setIcon(ExpressionResources.INSTANCE.columnReplaceByExpression()); } @@ -141,8 +143,8 @@ public class ReplaceColumnByMultiColumnExpressionDialog extends Window implement } protected void create() { - replaceColumnByMultiColumnExpressionPanel = new ReplaceColumnByMultiColumnExpressionPanel( - this, column, columns, eventBus, replaceExpressionType); + replaceColumnByMultiColumnExpressionPanel = new ReplaceColumnByMultiColumnExpressionPanel(this, column, columns, + eventBus, replaceExpressionType); add(replaceColumnByMultiColumnExpressionPanel); } @@ -155,59 +157,52 @@ public class ReplaceColumnByMultiColumnExpressionDialog extends Window implement this.cConditionExpression = exp; } - protected void applyReplaceColumnByExpression(ColumnData column, - boolean allRows, C_Expression cConditionExpression, + protected void applyReplaceColumnByExpression(ColumnData column, boolean allRows, C_Expression cConditionExpression, String replaceValue) { this.column = column; this.cConditionExpression = cConditionExpression; - ReplaceColumnByExpressionSession replaceColumnByExpressionSession = new ReplaceColumnByExpressionSession( - column, allRows, cConditionExpression, replaceValue); + ReplaceColumnByExpressionSession replaceColumnByExpressionSession = new ReplaceColumnByExpressionSession(column, + allRows, cConditionExpression, replaceValue); callApplyReplaceByExpression(replaceColumnByExpressionSession); } - protected void applyReplaceColumnByExpression(ColumnData column, - boolean allRows, C_Expression cConditionExpression, + protected void applyReplaceColumnByExpression(ColumnData column, boolean allRows, C_Expression cConditionExpression, C_Expression cReplaceExpression) { this.column = column; this.cConditionExpression = cConditionExpression; - ReplaceColumnByExpressionSession replaceColumnByExpressionSession = new ReplaceColumnByExpressionSession( - column, allRows, cConditionExpression, cReplaceExpression); + ReplaceColumnByExpressionSession replaceColumnByExpressionSession = new ReplaceColumnByExpressionSession(column, + allRows, cConditionExpression, cReplaceExpression); callApplyReplaceByExpression(replaceColumnByExpressionSession); } protected void load() { - TDGWTServiceAsync.INSTANCE.getColumns(trId, - new AsyncCallback>() { + TDGWTServiceAsync.INSTANCE.getColumns(trId, new AsyncCallback>() { - public void onFailure(Throwable caught) { - if (caught instanceof TDGWTSessionExpiredException) { - eventBus.fireEvent(new SessionExpiredEvent( - SessionExpiredType.EXPIREDONSERVER)); - } else { - if (caught instanceof TDGWTIsLockedException) { - Log.error(caught.getLocalizedMessage()); - UtilsGXT3.alert("Error Locked", - caught.getLocalizedMessage()); - } else { - Log.error("Error retrieving column: " - + caught.getMessage()); - UtilsGXT3.alert("Error retrieving column", - caught.getMessage()); - } - } + public void onFailure(Throwable caught) { + if (caught instanceof TDGWTSessionExpiredException) { + eventBus.fireEvent(new SessionExpiredEvent(SessionExpiredType.EXPIREDONSERVER)); + } else { + if (caught instanceof TDGWTIsLockedException) { + Log.error(caught.getLocalizedMessage()); + UtilsGXT3.alert("Error Locked", caught.getLocalizedMessage()); + } else { + Log.error("Error retrieving column: " + caught.getMessage()); + UtilsGXT3.alert("Error retrieving column", caught.getMessage()); } + } + } - public void onSuccess(ArrayList result) { - Log.debug("Retrived columns: " + result); - columns = result; - sanitizesColumns(); - create(); + public void onSuccess(ArrayList result) { + Log.debug("Retrived columns: " + result); + columns = result; + sanitizesColumns(); + create(); - } + } - }); + }); } @@ -215,14 +210,11 @@ public class ReplaceColumnByMultiColumnExpressionDialog extends Window implement ArrayList removableColumn = new ArrayList(); for (ColumnData c : columns) { if (c.getTypeCode().compareTo(ColumnTypeCode.DIMENSION.toString()) == 0 - || c.getTypeCode().compareTo( - ColumnTypeCode.TIMEDIMENSION.toString()) == 0) { + || c.getTypeCode().compareTo(ColumnTypeCode.TIMEDIMENSION.toString()) == 0) { removableColumn.add(c); } else { - if (c.getColumnId() != null && column != null - && column.getColumnId() != null - && !column.getColumnId().isEmpty() - && c.getColumnId().compareTo(column.getColumnId()) == 0) { + if (c.getColumnId() != null && column != null && column.getColumnId() != null + && !column.getColumnId().isEmpty() && c.getColumnId().compareTo(column.getColumnId()) == 0) { column = c; } } @@ -230,13 +222,11 @@ public class ReplaceColumnByMultiColumnExpressionDialog extends Window implement columns.removeAll(removableColumn); } - protected void callApplyReplaceByExpression( - ReplaceColumnByExpressionSession replaceColumnByExpressionSession) { - Log.debug("Replace Column By Expression Session " - + replaceColumnByExpressionSession); + protected void callApplyReplaceByExpression(ReplaceColumnByExpressionSession replaceColumnByExpressionSession) { + Log.debug("Replace Column By Expression Session " + replaceColumnByExpressionSession); - ExpressionServiceAsync.INSTANCE.startReplaceColumnByExpression( - replaceColumnByExpressionSession, new AsyncCallback() { + ExpressionServiceAsync.INSTANCE.startReplaceColumnByExpression(replaceColumnByExpressionSession, + new AsyncCallback() { @Override public void onSuccess(String taskId) { @@ -248,25 +238,21 @@ public class ReplaceColumnByMultiColumnExpressionDialog extends Window implement @Override public void onFailure(Throwable caught) { if (caught instanceof TDGWTSessionExpiredException) { - eventBus.fireEvent(new SessionExpiredEvent( - SessionExpiredType.EXPIREDONSERVER)); + eventBus.fireEvent(new SessionExpiredEvent(SessionExpiredType.EXPIREDONSERVER)); } else { if (caught instanceof TDGWTIsLockedException) { Log.error(caught.getLocalizedMessage()); - UtilsGXT3.alert("Error Locked", - caught.getLocalizedMessage()); + UtilsGXT3.alert("Error Locked", caught.getLocalizedMessage()); } else { if (caught instanceof TDGWTIsFinalException) { Log.error(caught.getLocalizedMessage()); - UtilsGXT3.alert("Error Final", - caught.getLocalizedMessage()); + UtilsGXT3.alert("Error Final", caught.getLocalizedMessage()); } else { Log.error("Error submitting replace column by expression: " + caught.getLocalizedMessage()); caught.printStackTrace(); - UtilsGXT3 - .alert("Error submitting replace column by expression", - caught.getLocalizedMessage()); + UtilsGXT3.alert("Error submitting replace column by expression", + caught.getLocalizedMessage()); } } } @@ -291,8 +277,7 @@ public class ReplaceColumnByMultiColumnExpressionDialog extends Window implement public void operationComplete(OperationResult operationResult) { ChangeTableWhy why = ChangeTableWhy.TABLEUPDATED; ChangeTableRequestEvent changeTableRequestEvent = new ChangeTableRequestEvent( - ChangeTableRequestType.COLUMNFILTER, operationResult.getTrId(), - why); + ChangeTableRequestType.COLUMNFILTER, operationResult.getTrId(), why); eventBus.fireEvent(changeTableRequestEvent); close(); } @@ -305,12 +290,10 @@ public class ReplaceColumnByMultiColumnExpressionDialog extends Window implement } @Override - public void operationStopped(OperationResult operationResult, - String reason, String details) { + public void operationStopped(OperationResult operationResult, String reason, String details) { ChangeTableWhy why = ChangeTableWhy.TABLECURATION; ChangeTableRequestEvent changeTableRequestEvent = new ChangeTableRequestEvent( - ChangeTableRequestType.COLUMNFILTER, operationResult.getTrId(), - why); + ChangeTableRequestType.COLUMNFILTER, operationResult.getTrId(), why); eventBus.fireEvent(changeTableRequestEvent); close(); diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByMultiColumnExpressionPanel.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByMultiColumnExpressionPanel.java index 4500ba7..d6a2857 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByMultiColumnExpressionPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByMultiColumnExpressionPanel.java @@ -57,8 +57,8 @@ import com.sencha.gxt.widget.core.client.form.TextField; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ReplaceColumnByMultiColumnExpressionPanel extends FramedPanel { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceExpressionDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceExpressionDialog.java index 252a4aa..1cc8421 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceExpressionDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceExpressionDialog.java @@ -27,18 +27,17 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ -public class ReplaceExpressionDialog extends Window implements - HasExpressionWrapperNotificationListener { +public class ReplaceExpressionDialog extends Window implements HasExpressionWrapperNotificationListener { private static final String WIDTH = "900px"; private static final String HEIGHT = "360px"; private ArrayList listeners; private ColumnData column; private ArrayList columns; - //private String columnLocalId; + // private String columnLocalId; private TRId trId; private EventBus eventBus; @@ -53,14 +52,16 @@ public class ReplaceExpressionDialog extends Window implements * * * @param column + * Column * @param trId + * Tabular Resource id * @param eventBus + * Event bus */ - public ReplaceExpressionDialog(ColumnData column, TRId trId, - EventBus eventBus) { - listeners=new ArrayList(); + public ReplaceExpressionDialog(ColumnData column, TRId trId, EventBus eventBus) { + listeners = new ArrayList(); this.eventBus = eventBus; - this.trId=trId; + this.trId = trId; this.column = column; type = ReplaceExpressionType.Replace; initWindow(); @@ -68,23 +69,24 @@ public class ReplaceExpressionDialog extends Window implements } - /** * - * ColumnMockUp must have set columnId, label, columnTypeCode and ColumnDataType. - * Column is not used to construct the expression. Columns are retrieved - * from TRId. + * ColumnMockUp must have set columnId, label, columnTypeCode and + * ColumnDataType. Column is not used to construct the expression. Columns + * are retrieved from TRId. * * - * @param column + * @param columnMockUp + * Column mockup * @param trId + * Tabular Resource id * @param eventBus + * Event bus */ - public ReplaceExpressionDialog(ColumnMockUp columnMockUp, TRId trId, - EventBus eventBus) { - listeners=new ArrayList(); + public ReplaceExpressionDialog(ColumnMockUp columnMockUp, TRId trId, EventBus eventBus) { + listeners = new ArrayList(); this.eventBus = eventBus; - this.trId=trId; + this.trId = trId; column = new ColumnData(); column.setId(columnMockUp.getId()); column.setColumnId(columnMockUp.getColumnId()); @@ -97,20 +99,24 @@ public class ReplaceExpressionDialog extends Window implements } - /** * - * ColumnMockUp and ColumnMockUpList must have set columnId, label, columnTypeCode and - * ColumnDataType. Column is not used to construct the expression. + * ColumnMockUp and ColumnMockUpList must have set columnId, label, + * columnTypeCode and ColumnDataType. Column is not used to construct the + * expression. * * - * @param column - * @param columns + * + * @param columnMockUp + * Column mockup + * @param columnMockUpList + * List of column mockup * @param eventBus + * Event bus */ - public ReplaceExpressionDialog(ColumnMockUp columnMockUp, - ArrayList columnMockUpList, EventBus eventBus) { - listeners=new ArrayList(); + public ReplaceExpressionDialog(ColumnMockUp columnMockUp, ArrayList columnMockUpList, + EventBus eventBus) { + listeners = new ArrayList(); this.eventBus = eventBus; column = new ColumnData(); column.setId(columnMockUp.getId()); @@ -118,22 +124,22 @@ public class ReplaceExpressionDialog extends Window implements column.setLabel(columnMockUp.getLabel()); column.setDataTypeName(columnMockUp.getColumnDataType().toString()); column.setTypeCode(columnMockUp.getColumnType().toString()); - Log.debug("ReplaceExpressionDialog: Column: "+column); - - columns=new ArrayList(); + Log.debug("ReplaceExpressionDialog: Column: " + column); + + columns = new ArrayList(); Log.debug("ReplaceExpressionDialog Columns:"); - for(ColumnMockUp colMock:columnMockUpList){ + for (ColumnMockUp colMock : columnMockUpList) { ColumnData col = new ColumnData(); col.setId(colMock.getId()); col.setColumnId(colMock.getColumnId()); col.setLabel(colMock.getLabel()); col.setDataTypeName(colMock.getColumnDataType().toString()); col.setTypeCode(colMock.getColumnType().toString()); - Log.debug("Columns: "+col); + Log.debug("Columns: " + col); columns.add(col); - + } - + type = ReplaceExpressionType.Template; initWindow(); sanitizesColumns(); @@ -149,14 +155,10 @@ public class ReplaceExpressionDialog extends Window implements setResizable(false); setHeadingText("Replace Expression"); setClosable(true); - getHeader().setIcon( - ExpressionResources.INSTANCE.columnReplaceByExpression()); + getHeader().setIcon(ExpressionResources.INSTANCE.columnReplaceByExpression()); } - /** - * {@inheritDoc} - */ @Override protected void initTools() { super.initTools(); @@ -171,48 +173,40 @@ public class ReplaceExpressionDialog extends Window implements } protected void create() { - replaceExpressionPanel = new ReplaceExpressionPanel(this, column, - columns, type, eventBus); + replaceExpressionPanel = new ReplaceExpressionPanel(this, column, columns, type, eventBus); add(replaceExpressionPanel); } - protected void applyReplaceColumnByExpression(ExpressionWrapperNotification expressionWrapperNotification) - { + protected void applyReplaceColumnByExpression(ExpressionWrapperNotification expressionWrapperNotification) { fire(expressionWrapperNotification); } - protected void load() { - TDGWTServiceAsync.INSTANCE.getColumns(trId, - new AsyncCallback>() { + TDGWTServiceAsync.INSTANCE.getColumns(trId, new AsyncCallback>() { - public void onFailure(Throwable caught) { - if (caught instanceof TDGWTSessionExpiredException) { - eventBus.fireEvent(new SessionExpiredEvent( - SessionExpiredType.EXPIREDONSERVER)); - } else { - if (caught instanceof TDGWTIsLockedException) { - Log.error(caught.getLocalizedMessage()); - UtilsGXT3.alert("Error Locked", - caught.getLocalizedMessage()); - } else { - Log.error("Error retrieving column: " - + caught.getMessage()); - UtilsGXT3.alert("Error retrieving column", - caught.getMessage()); - } - } + public void onFailure(Throwable caught) { + if (caught instanceof TDGWTSessionExpiredException) { + eventBus.fireEvent(new SessionExpiredEvent(SessionExpiredType.EXPIREDONSERVER)); + } else { + if (caught instanceof TDGWTIsLockedException) { + Log.error(caught.getLocalizedMessage()); + UtilsGXT3.alert("Error Locked", caught.getLocalizedMessage()); + } else { + Log.error("Error retrieving column: " + caught.getMessage()); + UtilsGXT3.alert("Error retrieving column", caught.getMessage()); } + } + } - public void onSuccess(ArrayList result) { - Log.debug("Retrived columns: " + result); - columns = result; - sanitizesColumns(); - create(); + public void onSuccess(ArrayList result) { + Log.debug("Retrived columns: " + result); + columns = result; + sanitizesColumns(); + create(); - } + } - }); + }); } @@ -220,12 +214,10 @@ public class ReplaceExpressionDialog extends Window implements ArrayList removableColumn = new ArrayList(); for (ColumnData c : columns) { if (c.getTypeCode().compareTo(ColumnTypeCode.DIMENSION.toString()) == 0 - || c.getTypeCode().compareTo( - ColumnTypeCode.TIMEDIMENSION.toString()) == 0) { + || c.getTypeCode().compareTo(ColumnTypeCode.TIMEDIMENSION.toString()) == 0) { removableColumn.add(c); } else { - if (column.getColumnId() != null - && c.getColumnId().compareTo(column.getColumnId()) == 0) { + if (column.getColumnId() != null && c.getColumnId().compareTo(column.getColumnId()) == 0) { removableColumn.add(c); } } @@ -240,42 +232,37 @@ public class ReplaceExpressionDialog extends Window implements @Override public void addExpressionWrapperNotificationListener(ExpressionWrapperNotificationListener handler) { listeners.add(handler); - + } @Override - public void removeExpressionWrapperNotificationListener( - ExpressionWrapperNotificationListener handler) { + public void removeExpressionWrapperNotificationListener(ExpressionWrapperNotificationListener handler) { listeners.remove(handler); - + } - protected void fire(ExpressionWrapperNotification notification) { - for(ExpressionWrapperNotificationListener listener:listeners){ + for (ExpressionWrapperNotificationListener listener : listeners) { listener.onExpression(notification); } hide(); - + } protected void fireAborted() { - for(ExpressionWrapperNotificationListener listener:listeners){ + for (ExpressionWrapperNotificationListener listener : listeners) { listener.aborted(); } hide(); } protected void fireFailed(Throwable throwable) { - for(ExpressionWrapperNotificationListener listener:listeners){ - listener.failed(throwable);; + for (ExpressionWrapperNotificationListener listener : listeners) { + listener.failed(throwable); + ; } hide(); - + } - - - - } diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceExpressionPanel.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceExpressionPanel.java index 18ae2f0..eda97d4 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceExpressionPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceExpressionPanel.java @@ -41,8 +41,8 @@ import com.sencha.gxt.widget.core.client.form.TextField; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ReplaceExpressionPanel extends FramedPanel { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RowsDeleteByExpressionDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RowsDeleteByExpressionDialog.java index 862ae39..0c215ab 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RowsDeleteByExpressionDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RowsDeleteByExpressionDialog.java @@ -32,8 +32,8 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class RowsDeleteByExpressionDialog extends Window implements MonitorDialogListener { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RowsDeleteByMultiColumnExpressionDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RowsDeleteByMultiColumnExpressionDialog.java index 74fea22..bb25da5 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RowsDeleteByMultiColumnExpressionDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RowsDeleteByMultiColumnExpressionDialog.java @@ -32,8 +32,8 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class RowsDeleteByMultiColumnExpressionDialog extends Window implements MonitorDialogListener { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleEditDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleEditDialog.java index c810523..e2ae505 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleEditDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleEditDialog.java @@ -22,8 +22,8 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class RuleEditDialog extends Window implements diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleEditPanel.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleEditPanel.java index da75127..9a2d7f5 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleEditPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleEditPanel.java @@ -25,8 +25,8 @@ import com.sencha.gxt.widget.core.client.form.TextField; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class RuleEditPanel extends FramedPanel { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleOnColumnCreateDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleOnColumnCreateDialog.java index 606020c..dcf5ad4 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleOnColumnCreateDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleOnColumnCreateDialog.java @@ -22,8 +22,8 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class RuleOnColumnCreateDialog extends Window implements @@ -37,8 +37,7 @@ public class RuleOnColumnCreateDialog extends Window implements /** * - * @param columnMockUp - * @param eventBus + * @param eventBus Event Bus */ public RuleOnColumnCreateDialog(EventBus eventBus) { listeners = new ArrayList(); diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleOnTableCreateDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleOnTableCreateDialog.java index 5f30208..e8d508b 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleOnTableCreateDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleOnTableCreateDialog.java @@ -23,37 +23,36 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ -public class RuleOnTableCreateDialog extends Window implements - HasRuleDialogNotificationListener { +public class RuleOnTableCreateDialog extends Window implements HasRuleDialogNotificationListener { private static final String WIDTH = "940px"; private static final String HEIGHT = "388px"; private MultiColumnExpressionPanel multiColumnExpressionPanel; private EventBus eventBus; private ArrayList listeners; private Object initialRuleDescriptionData; - /** * - * @param columnMockUp + * @param ruleDescriptionData + * Rule description * @param eventBus + * Event bus */ public RuleOnTableCreateDialog(RuleDescriptionData ruleDescriptionData, EventBus eventBus) { listeners = new ArrayList(); initWindow(); this.eventBus = eventBus; - this.initialRuleDescriptionData=ruleDescriptionData; + this.initialRuleDescriptionData = ruleDescriptionData; try { multiColumnExpressionPanel = new MultiColumnExpressionPanel(this, ruleDescriptionData); add(multiColumnExpressionPanel); } catch (MultiColumnExpressionPanelException e) { UtilsGXT3.alert("Attention", e.getLocalizedMessage()); } - } @@ -101,34 +100,30 @@ public class RuleOnTableCreateDialog extends Window implements public void saveColumnRule(RuleDescriptionData ruleDescriptionData) { - ExpressionServiceAsync.INSTANCE.saveRule(ruleDescriptionData, - new AsyncCallback() { + ExpressionServiceAsync.INSTANCE.saveRule(ruleDescriptionData, new AsyncCallback() { - @Override - public void onSuccess(String ruleId) { - Log.debug("Saved Rule: " + ruleId); - UtilsGXT3.info("Save Rule", "The rule is saved!"); - fireNotification(ruleId); + @Override + public void onSuccess(String ruleId) { + Log.debug("Saved Rule: " + ruleId); + UtilsGXT3.info("Save Rule", "The rule is saved!"); + fireNotification(ruleId); - } + } - @Override - public void onFailure(Throwable caught) { - if (caught instanceof TDGWTSessionExpiredException) { - eventBus.fireEvent(new SessionExpiredEvent( - SessionExpiredType.EXPIREDONSERVER)); - } else { - Log.error("Error saving column rule: " - + caught.getLocalizedMessage()); - caught.printStackTrace(); - UtilsGXT3.alert("Error saving column rule", - caught.getLocalizedMessage()); + @Override + public void onFailure(Throwable caught) { + if (caught instanceof TDGWTSessionExpiredException) { + eventBus.fireEvent(new SessionExpiredEvent(SessionExpiredType.EXPIREDONSERVER)); + } else { + Log.error("Error saving column rule: " + caught.getLocalizedMessage()); + caught.printStackTrace(); + UtilsGXT3.alert("Error saving column rule", caught.getLocalizedMessage()); - fireFailed(caught); - } + fireFailed(caught); + } - } - }); + } + }); } @@ -137,14 +132,12 @@ public class RuleOnTableCreateDialog extends Window implements } @Override - public void addRuleDialogNotificationListener( - RuleDialogNotificationListener handler) { + public void addRuleDialogNotificationListener(RuleDialogNotificationListener handler) { listeners.add(handler); } @Override - public void removeRuleDialogNotificationListener( - RuleDialogNotificationListener handler) { + public void removeRuleDialogNotificationListener(RuleDialogNotificationListener handler) { listeners.remove(handler); } diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/TemplateColumnExpressionDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/TemplateColumnExpressionDialog.java index 69a580d..b75a948 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/TemplateColumnExpressionDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/TemplateColumnExpressionDialog.java @@ -30,12 +30,11 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ -public class TemplateColumnExpressionDialog extends Window implements - HasExpressionWrapperNotificationListener { +public class TemplateColumnExpressionDialog extends Window implements HasExpressionWrapperNotificationListener { private static final String WIDTH = "670px"; private static final String HEIGHT = "426px"; private ArrayList listeners; @@ -48,7 +47,9 @@ public class TemplateColumnExpressionDialog extends Window implements /** * * @param columnMockUp + * Column Mockup * @param eventBus + * Event bus */ public TemplateColumnExpressionDialog(ColumnMockUp columnMockUp, EventBus eventBus) { listeners = new ArrayList(); @@ -66,8 +67,11 @@ public class TemplateColumnExpressionDialog extends Window implements /** * * @param trId + * Tabular Resource id * @param columnId + * Column id * @param eventBus + * Event bus */ public TemplateColumnExpressionDialog(TRId trId, String columnId, EventBus eventBus) { listeners = new ArrayList(); @@ -113,27 +117,18 @@ public class TemplateColumnExpressionDialog extends Window implements } protected void create() { - if (column.getTypeCode() - .compareTo(ColumnTypeCode.ANNOTATION.toString()) == 0 - || column.getTypeCode().compareTo( - ColumnTypeCode.ATTRIBUTE.toString()) == 0 - || column.getTypeCode().compareTo( - ColumnTypeCode.CODE.toString()) == 0 - || column.getTypeCode().compareTo( - ColumnTypeCode.CODEDESCRIPTION.toString()) == 0 - || column.getTypeCode().compareTo( - ColumnTypeCode.CODENAME.toString()) == 0 - || column.getTypeCode().compareTo( - ColumnTypeCode.MEASURE.toString()) == 0) { - columnExpressionPanel = new ColumnExpressionPanel(this, column, - eventBus); + if (column.getTypeCode().compareTo(ColumnTypeCode.ANNOTATION.toString()) == 0 + || column.getTypeCode().compareTo(ColumnTypeCode.ATTRIBUTE.toString()) == 0 + || column.getTypeCode().compareTo(ColumnTypeCode.CODE.toString()) == 0 + || column.getTypeCode().compareTo(ColumnTypeCode.CODEDESCRIPTION.toString()) == 0 + || column.getTypeCode().compareTo(ColumnTypeCode.CODENAME.toString()) == 0 + || column.getTypeCode().compareTo(ColumnTypeCode.MEASURE.toString()) == 0) { + columnExpressionPanel = new ColumnExpressionPanel(this, column, eventBus); add(columnExpressionPanel); } else { - HTML errorMessage = new HTML( - "This type of column is not supported for now!"); + HTML errorMessage = new HTML("This type of column is not supported for now!"); add(errorMessage); - AlertMessageBox d = new AlertMessageBox("Error", - "This type of column is not supported for now!"); + AlertMessageBox d = new AlertMessageBox("Error", "This type of column is not supported for now!"); d.addHideHandler(new HideHandler() { public void onHide(HideEvent event) { hide(); @@ -143,60 +138,51 @@ public class TemplateColumnExpressionDialog extends Window implements } } - protected void onExpression(ExpressionWrapperNotification expressionWrapperNotification){ + protected void onExpression(ExpressionWrapperNotification expressionWrapperNotification) { fireNotification(expressionWrapperNotification); } protected void load() { - TDGWTServiceAsync.INSTANCE.getColumn(columnId, trId, - new AsyncCallback() { - - public void onFailure(Throwable caught) { - if (caught instanceof TDGWTSessionExpiredException) { - eventBus.fireEvent(new SessionExpiredEvent( - SessionExpiredType.EXPIREDONSERVER)); - } else { - if (caught instanceof TDGWTIsLockedException) { - Log.error(caught.getLocalizedMessage()); - UtilsGXT3.alert("Error Locked", - caught.getLocalizedMessage()); - } else { - Log.error("Error retrieving column: " - + caught.getMessage()); - UtilsGXT3.alert( - "Error", - "Error retrieving column: " - + caught.getMessage()); - } - } - fireFailed(caught); + TDGWTServiceAsync.INSTANCE.getColumn(columnId, trId, new AsyncCallback() { + public void onFailure(Throwable caught) { + if (caught instanceof TDGWTSessionExpiredException) { + eventBus.fireEvent(new SessionExpiredEvent(SessionExpiredType.EXPIREDONSERVER)); + } else { + if (caught instanceof TDGWTIsLockedException) { + Log.error(caught.getLocalizedMessage()); + UtilsGXT3.alert("Error Locked", caught.getLocalizedMessage()); + } else { + Log.error("Error retrieving column: " + caught.getMessage()); + UtilsGXT3.alert("Error", "Error retrieving column: " + caught.getMessage()); } + } + fireFailed(caught); - public void onSuccess(ColumnData result) { - Log.debug("Retrived column: " + result); - column = result; - create(); - } + } - }); + public void onSuccess(ColumnData result) { + Log.debug("Retrived column: " + result); + column = result; + create(); + } + + }); } @Override - public void addExpressionWrapperNotificationListener( - ExpressionWrapperNotificationListener handler) { + public void addExpressionWrapperNotificationListener(ExpressionWrapperNotificationListener handler) { listeners.add(handler); - + } @Override - public void removeExpressionWrapperNotificationListener( - ExpressionWrapperNotificationListener handler) { + public void removeExpressionWrapperNotificationListener(ExpressionWrapperNotificationListener handler) { listeners.remove(handler); - + } - + private void fireNotification(ExpressionWrapperNotification expressionWrapperNotification) { if (listeners != null) { for (ExpressionWrapperNotificationListener listener : listeners) { @@ -224,6 +210,5 @@ public class TemplateColumnExpressionDialog extends Window implements hide(); } - - + } diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/TemplateMultiColumnExpressionDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/TemplateMultiColumnExpressionDialog.java index 30cff29..7aca7dc 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/TemplateMultiColumnExpressionDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/TemplateMultiColumnExpressionDialog.java @@ -19,12 +19,11 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ -public class TemplateMultiColumnExpressionDialog extends Window implements - HasExpressionWrapperNotificationListener { +public class TemplateMultiColumnExpressionDialog extends Window implements HasExpressionWrapperNotificationListener { private static final String WIDTH = "940px"; private static final String HEIGHT = "388px"; private ArrayList listeners; @@ -35,10 +34,11 @@ public class TemplateMultiColumnExpressionDialog extends Window implements /** * * @param columnsMockUp + * Columns mockup * @param eventBus + * Event bus */ - public TemplateMultiColumnExpressionDialog( - ArrayList columnsMockUp, EventBus eventBus) { + public TemplateMultiColumnExpressionDialog(ArrayList columnsMockUp, EventBus eventBus) { listeners = new ArrayList(); this.eventBus = eventBus; columns = new ArrayList(); @@ -58,18 +58,18 @@ public class TemplateMultiColumnExpressionDialog extends Window implements } protected void sanitizesColumns() { - ArrayList removableColumn=new ArrayList(); - for(ColumnData c:columns){ - if(c.getTypeCode().compareTo(ColumnTypeCode.DIMENSION.toString())==0|| - c.getTypeCode().compareTo(ColumnTypeCode.TIMEDIMENSION.toString())==0 ){ + ArrayList removableColumn = new ArrayList(); + for (ColumnData c : columns) { + if (c.getTypeCode().compareTo(ColumnTypeCode.DIMENSION.toString()) == 0 + || c.getTypeCode().compareTo(ColumnTypeCode.TIMEDIMENSION.toString()) == 0) { removableColumn.add(c); } else { - + } } columns.removeAll(removableColumn); } - + protected void initWindow() { setWidth(WIDTH); setHeight(HEIGHT); @@ -104,42 +104,37 @@ public class TemplateMultiColumnExpressionDialog extends Window implements } protected void create() { - if(columns.size()>0){ - multiColumnExpressionPanel = new MultiColumnExpressionPanel(this,columns, - eventBus); + if (columns.size() > 0) { + multiColumnExpressionPanel = new MultiColumnExpressionPanel(this, columns, eventBus); add(multiColumnExpressionPanel); } else { HTML errorMessage = new HTML( "Attention no columns with a type supported(Dimension and TimeDimension is not supported)!"); add(errorMessage); close(); - UtilsGXT3.alert("Attention","Attention no columns with a type supported(Dimension and TimeDimension is not supported)!"); + UtilsGXT3.alert("Attention", + "Attention no columns with a type supported(Dimension and TimeDimension is not supported)!"); } } - protected void onExpression( - ExpressionWrapperNotification expressionWrapperNotification) { + protected void onExpression(ExpressionWrapperNotification expressionWrapperNotification) { fireNotification(expressionWrapperNotification); } - @Override - public void addExpressionWrapperNotificationListener( - ExpressionWrapperNotificationListener handler) { + public void addExpressionWrapperNotificationListener(ExpressionWrapperNotificationListener handler) { listeners.add(handler); } @Override - public void removeExpressionWrapperNotificationListener( - ExpressionWrapperNotificationListener handler) { + public void removeExpressionWrapperNotificationListener(ExpressionWrapperNotificationListener handler) { listeners.remove(handler); } - private void fireNotification( - ExpressionWrapperNotification expressionWrapperNotification) { + private void fireNotification(ExpressionWrapperNotification expressionWrapperNotification) { if (listeners != null) { for (ExpressionWrapperNotificationListener listener : listeners) { listener.onExpression(expressionWrapperNotification); diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/custom/DefaultAppearance.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/custom/DefaultAppearance.java index 34778c2..44a22f9 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/custom/DefaultAppearance.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/custom/DefaultAppearance.java @@ -13,8 +13,8 @@ import com.sencha.gxt.core.client.dom.XElement; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class DefaultAppearance implements IconButtonAppearance { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/custom/IconButton.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/custom/IconButton.java index fdb2eef..6fccd33 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/custom/IconButton.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/custom/IconButton.java @@ -16,8 +16,8 @@ import com.sencha.gxt.widget.core.client.Component; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class IconButton extends Component implements HasClickHandlers { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/custom/IconButtonAppearance.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/custom/IconButtonAppearance.java index b4168c2..d9cadfe 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/custom/IconButtonAppearance.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/custom/IconButtonAppearance.java @@ -6,8 +6,8 @@ import com.sencha.gxt.core.client.dom.XElement; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface IconButtonAppearance { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/exception/MultiColumnExpressionPanelException.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/exception/MultiColumnExpressionPanelException.java index 3bbf741..8f37150 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/exception/MultiColumnExpressionPanelException.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/exception/MultiColumnExpressionPanelException.java @@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.expressionwidget.client.exception; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MultiColumnExpressionPanelException extends Exception { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/expression/ConditionOnMultiColumnWidget.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/expression/ConditionOnMultiColumnWidget.java index 48f3557..77040a6 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/expression/ConditionOnMultiColumnWidget.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/expression/ConditionOnMultiColumnWidget.java @@ -53,8 +53,8 @@ import com.sencha.gxt.widget.core.client.form.TextField; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ConditionOnMultiColumnWidget extends SimpleContainer { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/expression/ConditionWidget.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/expression/ConditionWidget.java index df3f42b..692e73a 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/expression/ConditionWidget.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/expression/ConditionWidget.java @@ -48,8 +48,8 @@ import com.sencha.gxt.widget.core.client.form.TextField; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ConditionWidget extends SimpleContainer { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/expression/ReplaceWidget.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/expression/ReplaceWidget.java index 5f964df..ef46247 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/expression/ReplaceWidget.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/expression/ReplaceWidget.java @@ -45,8 +45,8 @@ import com.sencha.gxt.widget.core.client.form.TextField; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ReplaceWidget extends SimpleContainer { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/help/HelpReplaceColumnByExpression.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/help/HelpReplaceColumnByExpression.java index ff00bee..5d228cf 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/help/HelpReplaceColumnByExpression.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/help/HelpReplaceColumnByExpression.java @@ -12,6 +12,11 @@ import com.sencha.gxt.core.client.XTemplates; import com.sencha.gxt.core.client.dom.XDOM; import com.sencha.gxt.core.client.dom.XElement; +/** + * + * @author Giancarlo Panichi + * + */ public class HelpReplaceColumnByExpression { public interface HelpReplaceByExpTemplate extends XTemplates { @XTemplate(source = "HelpReplaceByExp.html") diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/help/HelpReplaceColumnByExpressionDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/help/HelpReplaceColumnByExpressionDialog.java index 7a05c4d..10683d2 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/help/HelpReplaceColumnByExpressionDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/help/HelpReplaceColumnByExpressionDialog.java @@ -9,8 +9,8 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class HelpReplaceColumnByExpressionDialog extends Window { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/help/HelpReplaceColumnByExpressionPanel.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/help/HelpReplaceColumnByExpressionPanel.java index ab0a2d1..338998a 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/help/HelpReplaceColumnByExpressionPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/help/HelpReplaceColumnByExpressionPanel.java @@ -23,8 +23,8 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class HelpReplaceColumnByExpressionPanel extends FramedPanel { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/ArgType.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/ArgType.java index 8fb95c0..9b17622 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/ArgType.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/ArgType.java @@ -6,8 +6,8 @@ import java.util.List; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum ArgType { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/ArgTypePropertiesCombo.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/ArgTypePropertiesCombo.java index e090fc7..f3a37db 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/ArgTypePropertiesCombo.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/ArgTypePropertiesCombo.java @@ -7,8 +7,8 @@ import com.sencha.gxt.data.shared.PropertyAccess; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface ArgTypePropertiesCombo extends diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/DepthOfExpressionElement.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/DepthOfExpressionElement.java index 57c0aba..d334c59 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/DepthOfExpressionElement.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/DepthOfExpressionElement.java @@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.expressionwidget.client.multicolumn; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class DepthOfExpressionElement { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/DepthOfExpressionElementPropertiesCombo.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/DepthOfExpressionElementPropertiesCombo.java index 8b916a2..8577e53 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/DepthOfExpressionElementPropertiesCombo.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/DepthOfExpressionElementPropertiesCombo.java @@ -7,8 +7,8 @@ import com.sencha.gxt.data.shared.PropertyAccess; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface DepthOfExpressionElementPropertiesCombo extends diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/DepthOfExpressionStore.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/DepthOfExpressionStore.java index 4753980..b1793a6 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/DepthOfExpressionStore.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/DepthOfExpressionStore.java @@ -5,8 +5,8 @@ import java.util.ArrayList; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class DepthOfExpressionStore implements Serializable { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/DepthOfExpressionType.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/DepthOfExpressionType.java index 5c59a77..5c88a01 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/DepthOfExpressionType.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/DepthOfExpressionType.java @@ -6,8 +6,8 @@ import java.util.List; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum DepthOfExpressionType { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/LogicalDepth.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/LogicalDepth.java index 8387304..26d08a9 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/LogicalDepth.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/multicolumn/LogicalDepth.java @@ -7,8 +7,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class LogicalDepth implements Serializable { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/notification/ExpressionWrapperNotification.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/notification/ExpressionWrapperNotification.java index 1881dc0..d5a35e5 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/notification/ExpressionWrapperNotification.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/notification/ExpressionWrapperNotification.java @@ -4,8 +4,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.client.expression.Expression /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ExpressionWrapperNotification { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/notification/RuleDialogNotification.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/notification/RuleDialogNotification.java index bdb2191..a2881e7 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/notification/RuleDialogNotification.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/notification/RuleDialogNotification.java @@ -3,8 +3,8 @@ package org.gcube.portlets.user.td.expressionwidget.client.notification; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class RuleDialogNotification { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/notification/RuleEditDialogNotification.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/notification/RuleEditDialogNotification.java index f8ce56c..25e22fa 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/notification/RuleEditDialogNotification.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/notification/RuleEditDialogNotification.java @@ -3,8 +3,8 @@ package org.gcube.portlets.user.td.expressionwidget.client.notification; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class RuleEditDialogNotification { 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 index b282f65..b88daaf 100644 --- 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 @@ -8,8 +8,8 @@ import org.gcube.portlets.user.td.expressionwidget.shared.model.C_OperatorType; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class Operation implements Serializable { 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 index 76c377f..9d5106b 100644 --- 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 @@ -7,8 +7,8 @@ import com.sencha.gxt.data.shared.PropertyAccess; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface OperationProperties extends PropertyAccess { 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 9655a9b..c646319 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 @@ -10,8 +10,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataT /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class OperationsStore { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ColumnDataProperties.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ColumnDataProperties.java index c8b3a08..3b0fc31 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ColumnDataProperties.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ColumnDataProperties.java @@ -9,8 +9,8 @@ import com.sencha.gxt.data.shared.PropertyAccess; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface ColumnDataProperties extends diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ColumnDataPropertiesCombo.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ColumnDataPropertiesCombo.java index da69cfe..eeaaaf3 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ColumnDataPropertiesCombo.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ColumnDataPropertiesCombo.java @@ -9,8 +9,8 @@ import com.sencha.gxt.data.shared.PropertyAccess; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface ColumnDataPropertiesCombo extends diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ColumnDataTypeProperties.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ColumnDataTypeProperties.java index 10bf107..1991079 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ColumnDataTypeProperties.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ColumnDataTypeProperties.java @@ -11,8 +11,8 @@ import com.sencha.gxt.data.shared.PropertyAccess; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface ColumnDataTypeProperties extends diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ColumnTypeCodeProperties.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ColumnTypeCodeProperties.java index 932cbcf..4e3a5b2 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ColumnTypeCodeProperties.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ColumnTypeCodeProperties.java @@ -12,8 +12,8 @@ import com.sencha.gxt.data.shared.PropertyAccess; /** * * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface ColumnTypeCodeProperties extends diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/LocaleTypeProperties.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/LocaleTypeProperties.java index ea21315..b25fbd7 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/LocaleTypeProperties.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/LocaleTypeProperties.java @@ -10,8 +10,8 @@ import com.sencha.gxt.data.shared.PropertyAccess; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface LocaleTypeProperties extends diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ReplaceElement.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ReplaceElement.java index e7e2a9c..bc1c5ce 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ReplaceElement.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ReplaceElement.java @@ -6,8 +6,8 @@ import org.gcube.portlets.user.td.expressionwidget.shared.replace.ReplaceType; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ReplaceElement implements Serializable { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ReplaceElementProperties.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ReplaceElementProperties.java index e123e3f..09e8955 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ReplaceElementProperties.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ReplaceElementProperties.java @@ -7,8 +7,8 @@ import com.sencha.gxt.data.shared.PropertyAccess; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface ReplaceElementProperties extends PropertyAccess { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ReplaceElementStore.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ReplaceElementStore.java index e4506c3..77e8f65 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ReplaceElementStore.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/ReplaceElementStore.java @@ -6,8 +6,8 @@ import org.gcube.portlets.user.td.expressionwidget.shared.replace.ReplaceType; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ReplaceElementStore { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/RuleColumnPlaceHolderDescriptorProperties.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/RuleColumnPlaceHolderDescriptorProperties.java index 6459eab..47d87bc 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/RuleColumnPlaceHolderDescriptorProperties.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/RuleColumnPlaceHolderDescriptorProperties.java @@ -10,8 +10,8 @@ import com.sencha.gxt.data.shared.PropertyAccess; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface RuleColumnPlaceHolderDescriptorProperties extends diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/TabResourceProperties.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/TabResourceProperties.java index 5a30dc4..84da2c4 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/TabResourceProperties.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/TabResourceProperties.java @@ -11,8 +11,8 @@ import com.sencha.gxt.data.shared.PropertyAccess; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface TabResourceProperties extends PropertyAccess { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/TabResourcePropertiesCombo.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/TabResourcePropertiesCombo.java index 647bd16..10561f3 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/TabResourcePropertiesCombo.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/properties/TabResourcePropertiesCombo.java @@ -9,8 +9,8 @@ import com.sencha.gxt.data.shared.PropertyAccess; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface TabResourcePropertiesCombo extends 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 70e541d..3ff6afd 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 @@ -6,8 +6,8 @@ import com.google.gwt.resources.client.ImageResource; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface ExpressionResources extends ClientBundle { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionService.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionService.java index 9d08cff..505f8b4 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionService.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionService.java @@ -26,68 +26,45 @@ import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; * * Implements the basic interfaces generate and submit Expression on service. * - *

- * Allows:   - *

    - *
  • Generate Expression
    • - *
      - *

      + * Allows Generate Expression * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * + * @author Giancarlo Panichi + * * */ @RemoteServiceRelativePath("ExpressionService") public interface ExpressionService extends RemoteService { - /** - * Submit Column Filter Operation - * - * @param columnFilterSession - * @throws ExpressionServiceException - */ - public String startFilterColumn(FilterColumnSession filterColumnSession) - throws TDGWTServiceException; + public String startFilterColumn(FilterColumnSession filterColumnSession) throws TDGWTServiceException; public String startReplaceColumnByExpression( - ReplaceColumnByExpressionSession replaceColumnByExpressionColumnSession) + ReplaceColumnByExpressionSession replaceColumnByExpressionColumnSession) throws TDGWTServiceException; + + public String startAddColumn(AddColumnSession addColumnSession) throws TDGWTServiceException; + + public ArrayList getRules() throws TDGWTServiceException; + + public ArrayList getRules(RuleScopeType scope) throws TDGWTServiceException; + + public ArrayList getApplicableBaseColumnRules(ColumnData columnData) throws TDGWTServiceException; - public String startAddColumn(AddColumnSession addColumnSession) - throws TDGWTServiceException; + public String saveRule(RuleDescriptionData ruleDescriptionData) throws TDGWTServiceException; - public ArrayList getRules() - throws TDGWTServiceException; + public void updateColumnRule(RuleDescriptionData ruleDescriptionData) throws TDGWTServiceException; - public ArrayList getRules(RuleScopeType scope) - throws TDGWTServiceException; - - public ArrayList getApplicableBaseColumnRules( - ColumnData columnData) throws TDGWTServiceException; - - public String saveRule(RuleDescriptionData ruleDescriptionData) - throws TDGWTServiceException; - - public void updateColumnRule(RuleDescriptionData ruleDescriptionData) - throws TDGWTServiceException; - public void removeRulesById(ArrayList rules) throws TDGWTServiceException; - + public String startApplyAndDetachColumnRules(ApplyAndDetachColumnRulesSession applyColumnRulesSession) throws TDGWTServiceException; - - public void setDetachColumnRules(DetachColumnRulesSession detachColumnRulesSession) - throws TDGWTServiceException; - - public void setDetachTableRules(DetachTableRulesSession detachTableRulesSession) - throws TDGWTServiceException; - - - public String startApplyTableRule(ApplyTableRuleSession applyTableRuleSession) - throws TDGWTServiceException; - - - public AppliedRulesResponseData getActiveRulesByTabularResourceId(TRId trId) - throws TDGWTServiceException; - + + public void setDetachColumnRules(DetachColumnRulesSession detachColumnRulesSession) throws TDGWTServiceException; + + public void setDetachTableRules(DetachTableRulesSession detachTableRulesSession) throws TDGWTServiceException; + + public String startApplyTableRule(ApplyTableRuleSession applyTableRuleSession) throws TDGWTServiceException; + + public AppliedRulesResponseData getActiveRulesByTabularResourceId(TRId trId) throws TDGWTServiceException; + } diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionServiceAsync.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionServiceAsync.java index e06a040..0abb6e6 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionServiceAsync.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionServiceAsync.java @@ -23,8 +23,8 @@ import com.google.gwt.user.client.rpc.AsyncCallback; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/store/ColumnDataTypeElement.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/store/ColumnDataTypeElement.java index 10af209..937b6f6 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/store/ColumnDataTypeElement.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/store/ColumnDataTypeElement.java @@ -4,8 +4,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataT /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ColumnDataTypeElement { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/store/ColumnDataTypeStore.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/store/ColumnDataTypeStore.java index f4b6f1c..4147b0a 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/store/ColumnDataTypeStore.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/store/ColumnDataTypeStore.java @@ -7,8 +7,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataT /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ColumnDataTypeStore implements Serializable { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/store/ColumnTypeCodeElement.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/store/ColumnTypeCodeElement.java index af69f04..d50952b 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/store/ColumnTypeCodeElement.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/store/ColumnTypeCodeElement.java @@ -4,8 +4,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeC /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ColumnTypeCodeElement { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/store/ColumnTypeCodeStore.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/store/ColumnTypeCodeStore.java index 7ebd4ff..16ee6e3 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/store/ColumnTypeCodeStore.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/store/ColumnTypeCodeStore.java @@ -10,8 +10,8 @@ import com.allen_sauer.gwt.log.client.Log; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ColumnTypeCodeStore implements Serializable { @@ -127,10 +127,7 @@ public class ColumnTypeCodeStore implements Serializable { return store; } - /** - * - * @return - */ + public static ArrayList getColumnTypeCodesForGeneric() { store = new ArrayList(); store.add(annotation); diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/store/LocaleTypeElement.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/store/LocaleTypeElement.java index d3e1fec..47c3899 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/store/LocaleTypeElement.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/store/LocaleTypeElement.java @@ -4,8 +4,8 @@ import java.io.Serializable; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class LocaleTypeElement implements Serializable { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/threshold/Threshold.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/threshold/Threshold.java index ea04521..62c4ecf 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/threshold/Threshold.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/threshold/Threshold.java @@ -6,8 +6,8 @@ import java.io.Serializable; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class Threshold implements Serializable { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/threshold/ThresholdProperties.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/threshold/ThresholdProperties.java index b4df22c..1d637a1 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/threshold/ThresholdProperties.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/threshold/ThresholdProperties.java @@ -7,8 +7,8 @@ import com.sencha.gxt.data.shared.PropertyAccess; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface ThresholdProperties extends PropertyAccess { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/threshold/ThresholdStore.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/threshold/ThresholdStore.java index 00162c7..7d91fd6 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/threshold/ThresholdStore.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/threshold/ThresholdStore.java @@ -6,8 +6,8 @@ import java.util.ArrayList; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ThresholdStore { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/type/ReplaceExpressionType.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/type/ReplaceExpressionType.java index 5e7a4c1..40dc9ec 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/type/ReplaceExpressionType.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/type/ReplaceExpressionType.java @@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.expressionwidget.client.type; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum ReplaceExpressionType { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/utils/InfoMessageBox.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/utils/InfoMessageBox.java index 9a1abb3..dce5c22 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/utils/InfoMessageBox.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/utils/InfoMessageBox.java @@ -4,8 +4,8 @@ import com.sencha.gxt.widget.core.client.box.MessageBox; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class InfoMessageBox extends MessageBox { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/utils/UtilsGXT3.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/utils/UtilsGXT3.java index 9872636..3ef7f2c 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/utils/UtilsGXT3.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/utils/UtilsGXT3.java @@ -8,8 +8,8 @@ import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class UtilsGXT3 { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/CExpressionMapServlet.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/CExpressionMapServlet.java index 9770359..352219d 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/CExpressionMapServlet.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/CExpressionMapServlet.java @@ -25,8 +25,8 @@ import org.slf4j.LoggerFactory; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class CExpressionMapServlet extends HttpServlet { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/C_ExpressionParser.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/C_ExpressionParser.java index c571e9d..b21d21f 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/C_ExpressionParser.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/C_ExpressionParser.java @@ -132,18 +132,18 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataT import org.slf4j.Logger; import org.slf4j.LoggerFactory; - public class C_ExpressionParser { - private static Logger logger = LoggerFactory - .getLogger(C_ExpressionParser.class); + private static Logger logger = LoggerFactory.getLogger(C_ExpressionParser.class); private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); /** * * @param exp - * @return + * Expression + * @return Client Expression * @throws ExpressionParserException + * Exception */ public C_Expression parse(Expression exp) throws ExpressionParserException { logger.debug("Parse: " + exp); @@ -162,7 +162,7 @@ public class C_ExpressionParser { } if (exp instanceof Exponentiation) { - //TODO + // TODO return ex; } @@ -225,9 +225,9 @@ public class C_ExpressionParser { if (exp instanceof TextMatchSQLRegexp) { return getTextMatchSQLRegexp(exp); } - + if (exp instanceof TextMatchPosixRegexp) { - //TODO + // TODO return ex; } @@ -248,7 +248,7 @@ public class C_ExpressionParser { } if (exp instanceof RepeatText) { - //TODO + // TODO return ex; } @@ -257,7 +257,7 @@ public class C_ExpressionParser { } if (exp instanceof Length) { - //TODO + // TODO return ex; } @@ -294,7 +294,7 @@ public class C_ExpressionParser { } if (exp instanceof ExternalReferenceExpression) { - //TODO + // TODO return ex; } @@ -312,7 +312,7 @@ public class C_ExpressionParser { } if (exp instanceof Case) { - //TODO + // TODO return ex; } @@ -345,27 +345,27 @@ public class C_ExpressionParser { // TDTypeValue if (exp instanceof TDBoolean) { - return getExpressionValue((TDBoolean)exp); + return getExpressionValue((TDBoolean) exp); } if (exp instanceof TDDate) { - return getExpressionValue((TDDate)exp); + return getExpressionValue((TDDate) exp); } if (exp instanceof TDInteger) { - return getExpressionValue((TDInteger)exp); + return getExpressionValue((TDInteger) exp); } if (exp instanceof TDNumeric) { - return getExpressionValue((TDNumeric)exp); + return getExpressionValue((TDNumeric) exp); } if (exp instanceof TDText) { - return getExpressionValue((TDText)exp); + return getExpressionValue((TDText) exp); } if (exp instanceof TDGeometry) { - return getExpressionValue((TDGeometry)exp); + return getExpressionValue((TDGeometry) exp); } if (exp instanceof Cast) { @@ -403,14 +403,12 @@ public class C_ExpressionParser { } - public C_MultivaluedExpression parseMultivalued(Expression exp) - throws ExpressionParserException { + public C_MultivaluedExpression parseMultivalued(Expression exp) throws ExpressionParserException { if (exp instanceof ConstantList) { return getConstantList((ConstantList) exp); } - if (exp instanceof ExternalReferenceExpression) { return null; } @@ -418,13 +416,10 @@ public class C_ExpressionParser { return null; } - private C_Expression getValueIsIn(Expression exp) - throws ExpressionParserException { + private C_Expression getValueIsIn(Expression exp) throws ExpressionParserException { ValueIsIn v = (ValueIsIn) exp; - C_MultivaluedExpression multivalued = parseMultivalued(v - .getRightArgument()); - C_ValueIsIn valueIsIn = new C_ValueIsIn(parse(v.getLeftArgument()), - multivalued); + C_MultivaluedExpression multivalued = parseMultivalued(v.getRightArgument()); + C_ValueIsIn valueIsIn = new C_ValueIsIn(parse(v.getLeftArgument()), multivalued); return valueIsIn; } @@ -441,38 +436,32 @@ public class C_ExpressionParser { return or; } - private C_Expression getNot(Expression exp) - throws ExpressionParserException { + private C_Expression getNot(Expression exp) throws ExpressionParserException { Not n = (Not) exp; C_Not not = new C_Not(parse(n.getArgument())); return not; } - private C_Expression getIsNull(Expression exp) - throws ExpressionParserException { + private C_Expression getIsNull(Expression exp) throws ExpressionParserException { IsNull nullIs = (IsNull) exp; C_IsNull isNull = new C_IsNull(parse(nullIs.getArgument())); return isNull; } - private C_Expression getIsNotNull(Expression exp) - throws ExpressionParserException { + private C_Expression getIsNotNull(Expression exp) throws ExpressionParserException { IsNotNull nullNotIs = (IsNotNull) exp; C_IsNotNull isNotNull = new C_IsNotNull(parse(nullNotIs.getArgument())); return isNotNull; } - private C_Expression getBetween(Expression exp) - throws ExpressionParserException { + private C_Expression getBetween(Expression exp) throws ExpressionParserException { Between bet = (Between) exp; - C_Between between=new C_Between(parse(bet.getLeftArgument()), - parse(bet.getMinRangeArgument()), + C_Between between = new C_Between(parse(bet.getLeftArgument()), parse(bet.getMinRangeArgument()), parse(bet.getMaxRangeArgument())); return between; } - private C_Expression getAnd(Expression exp) - throws ExpressionParserException { + private C_Expression getAnd(Expression exp) throws ExpressionParserException { And o = (And) exp; List listExp = o.getArguments(); List listCExp = new ArrayList(); @@ -485,144 +474,116 @@ public class C_ExpressionParser { return and; } - private C_Expression getTextMatchSQLRegexp(Expression exp) - throws ExpressionParserException { + private C_Expression getTextMatchSQLRegexp(Expression exp) throws ExpressionParserException { TextMatchSQLRegexp reg = (TextMatchSQLRegexp) exp; - C_TextMatchSQLRegexp regExp = new C_TextMatchSQLRegexp( - parse(reg.getLeftArgument()), parse(reg.getRightArgument())); + C_TextMatchSQLRegexp regExp = new C_TextMatchSQLRegexp(parse(reg.getLeftArgument()), + parse(reg.getRightArgument())); return regExp; } - private C_Expression getTextEndWith(Expression exp) - throws ExpressionParserException { + private C_Expression getTextEndWith(Expression exp) throws ExpressionParserException { TextEndsWith textEnd = (TextEndsWith) exp; - C_TextEndsWith textEndWith = new C_TextEndsWith( - parse(textEnd.getLeftArgument()), + C_TextEndsWith textEndWith = new C_TextEndsWith(parse(textEnd.getLeftArgument()), parse(textEnd.getRightArgument())); return textEndWith; } - private C_Expression getTextContains(Expression exp) - throws ExpressionParserException { + private C_Expression getTextContains(Expression exp) throws ExpressionParserException { TextContains textContains = (TextContains) exp; - C_TextContains textCont = new C_TextContains( - parse(textContains.getLeftArgument()), + C_TextContains textCont = new C_TextContains(parse(textContains.getLeftArgument()), parse(textContains.getRightArgument())); return textCont; } - private C_Expression getTextBeginWith(Expression exp) - throws ExpressionParserException { + private C_Expression getTextBeginWith(Expression exp) throws ExpressionParserException { TextBeginsWith textB = (TextBeginsWith) exp; - C_TextBeginsWith textBegins = new C_TextBeginsWith( - parse(textB.getLeftArgument()), parse(textB.getRightArgument())); + C_TextBeginsWith textBegins = new C_TextBeginsWith(parse(textB.getLeftArgument()), + parse(textB.getRightArgument())); return textBegins; } - private C_Expression getNotLess(Expression exp) - throws ExpressionParserException { + private C_Expression getNotLess(Expression exp) throws ExpressionParserException { NotLess notL = (NotLess) exp; - C_NotLess notLess = new C_NotLess(parse(notL.getLeftArgument()), - parse(notL.getRightArgument())); + C_NotLess notLess = new C_NotLess(parse(notL.getLeftArgument()), parse(notL.getRightArgument())); return notLess; } - private C_Expression getNotGreater(Expression exp) - throws ExpressionParserException { + private C_Expression getNotGreater(Expression exp) throws ExpressionParserException { NotGreater notG = (NotGreater) exp; - C_NotGreater notGreater = new C_NotGreater( - parse(notG.getLeftArgument()), parse(notG.getRightArgument())); + C_NotGreater notGreater = new C_NotGreater(parse(notG.getLeftArgument()), parse(notG.getRightArgument())); return notGreater; } - private C_Expression getNotEquals(Expression exp) - throws ExpressionParserException { + private C_Expression getNotEquals(Expression exp) throws ExpressionParserException { NotEquals notE = (NotEquals) exp; - C_NotEquals notEquals = new C_NotEquals(parse(notE.getLeftArgument()), - parse(notE.getRightArgument())); + C_NotEquals notEquals = new C_NotEquals(parse(notE.getLeftArgument()), parse(notE.getRightArgument())); return notEquals; } - private C_Expression getLessThan(Expression exp) - throws ExpressionParserException { + private C_Expression getLessThan(Expression exp) throws ExpressionParserException { LessThan lessT = (LessThan) exp; - C_LessThan lessThan = new C_LessThan(parse(lessT.getLeftArgument()), - parse(lessT.getRightArgument())); + C_LessThan lessThan = new C_LessThan(parse(lessT.getLeftArgument()), parse(lessT.getRightArgument())); return lessThan; } - private C_Expression getLessOrEquals(Expression exp) - throws ExpressionParserException { + private C_Expression getLessOrEquals(Expression exp) throws ExpressionParserException { LessOrEquals lessOrE = (LessOrEquals) exp; - C_LessOrEquals lessOrEquals = new C_LessOrEquals( - parse(lessOrE.getLeftArgument()), + C_LessOrEquals lessOrEquals = new C_LessOrEquals(parse(lessOrE.getLeftArgument()), parse(lessOrE.getRightArgument())); return lessOrEquals; } - private C_Expression getGreaterThan(Expression exp) - throws ExpressionParserException { + private C_Expression getGreaterThan(Expression exp) throws ExpressionParserException { GreaterThan greaterThan = (GreaterThan) exp; - C_GreaterThan greater = new C_GreaterThan( - parse(greaterThan.getLeftArgument()), + C_GreaterThan greater = new C_GreaterThan(parse(greaterThan.getLeftArgument()), parse(greaterThan.getRightArgument())); return greater; } - private C_Expression getGreaterOrEquals(Expression exp) - throws ExpressionParserException { + private C_Expression getGreaterOrEquals(Expression exp) throws ExpressionParserException { GreaterOrEquals greaterOrEq = (GreaterOrEquals) exp; - C_GreaterOrEquals greaterOrEquals = new C_GreaterOrEquals( - parse(greaterOrEq.getLeftArgument()), + C_GreaterOrEquals greaterOrEquals = new C_GreaterOrEquals(parse(greaterOrEq.getLeftArgument()), parse(greaterOrEq.getRightArgument())); return greaterOrEquals; } - private TD_Value getExpressionValue(TDTypeValue value) - throws ExpressionParserException { + private TD_Value getExpressionValue(TDTypeValue value) throws ExpressionParserException { try { if (value instanceof TDBoolean) { TDBoolean tdboolean = (TDBoolean) value; - return new TD_Value(ColumnDataType.Boolean, - String.valueOf(tdboolean.getValue())); + return new TD_Value(ColumnDataType.Boolean, String.valueOf(tdboolean.getValue())); } if (value instanceof TDDate) { TDDate tddate = (TDDate) value; - return new TD_Value(ColumnDataType.Date, sdf.format(tddate - .getValue())); + return new TD_Value(ColumnDataType.Date, sdf.format(tddate.getValue())); } if (value instanceof TDGeometry) { TDGeometry tdgeometry = (TDGeometry) value; - return new TD_Value(ColumnDataType.Geometry, - tdgeometry.getValue()); + return new TD_Value(ColumnDataType.Geometry, tdgeometry.getValue()); } if (value instanceof TDInteger) { TDInteger tdinteger = (TDInteger) value; - return new TD_Value(ColumnDataType.Integer, - String.valueOf(tdinteger.getValue())); + return new TD_Value(ColumnDataType.Integer, String.valueOf(tdinteger.getValue())); } if (value instanceof TDNumeric) { TDNumeric tdnumeric = (TDNumeric) value; - return new TD_Value(ColumnDataType.Numeric, - String.valueOf(tdnumeric.getValue())); + return new TD_Value(ColumnDataType.Numeric, String.valueOf(tdnumeric.getValue())); } if (value instanceof TDText) { TDText tdtext = (TDText) value; - return new TD_Value(ColumnDataType.Text, String.valueOf(tdtext - .getValue())); + return new TD_Value(ColumnDataType.Text, String.valueOf(tdtext.getValue())); } } catch (Throwable e) { - logger.error("type error parsing value " + value + " " - + e.getLocalizedMessage()); + logger.error("type error parsing value " + value + " " + e.getLocalizedMessage()); } return null; } @@ -655,8 +616,7 @@ public class C_ExpressionParser { } } - private C_Expression getConstantList(Expression exp) - throws ExpressionParserException { + private C_Expression getConstantList(Expression exp) throws ExpressionParserException { List l = new ArrayList(); ConstantList c = (ConstantList) exp; List arguments = c.getArguments(); @@ -669,8 +629,7 @@ public class C_ExpressionParser { return constList; } - private C_MultivaluedExpression getConstantList(ConstantList c) - throws ExpressionParserException { + private C_MultivaluedExpression getConstantList(ConstantList c) throws ExpressionParserException { List l = new ArrayList(); List arguments = c.getArguments(); TD_Value tdv; @@ -684,8 +643,8 @@ public class C_ExpressionParser { private C_Expression getColumnReferencePlaceholder(Expression exp) { ColumnReferencePlaceholder c = (ColumnReferencePlaceholder) exp; - C_ColumnReferencePlaceholder col = new C_ColumnReferencePlaceholder( - mapColumnDataType(c.getDatatype()), c.getId(), c.getLabel()); + C_ColumnReferencePlaceholder col = new C_ColumnReferencePlaceholder(mapColumnDataType(c.getDatatype()), + c.getId(), c.getLabel()); return col; } @@ -698,7 +657,7 @@ public class C_ExpressionParser { TRId trId = new TRId(); trId.setTableId(tableId); trId.setViewTable(false); - ColumnData column=new ColumnData(); + ColumnData column = new ColumnData(); column.setId(columnId); column.setColumnId(columnId); column.setTrId(trId); @@ -708,48 +667,42 @@ public class C_ExpressionParser { return ref; } - private C_Expression getUpper(Expression exp) - throws ExpressionParserException { + private C_Expression getUpper(Expression exp) throws ExpressionParserException { Upper e = (Upper) exp; C_Expression arg = parse(e.getArgument()); C_Upper upper = new C_Upper(arg); return upper; } - private C_Expression getLower(Expression exp) - throws ExpressionParserException { + private C_Expression getLower(Expression exp) throws ExpressionParserException { Lower e = (Lower) exp; C_Expression arg = parse(e.getArgument()); C_Lower lower = new C_Lower(arg); return lower; } - private C_Expression getTrim(Expression exp) - throws ExpressionParserException { + private C_Expression getTrim(Expression exp) throws ExpressionParserException { Trim e = (Trim) exp; C_Expression arg = parse(e.getArgument()); C_Trim trim = new C_Trim(arg); return trim; } - private C_Expression getMD5(Expression exp) - throws ExpressionParserException { + private C_Expression getMD5(Expression exp) throws ExpressionParserException { MD5 e = (MD5) exp; C_Expression arg = parse(e.getArgument()); C_MD5 md5 = new C_MD5(arg); return md5; } - private C_Expression getSoundex(Expression exp) - throws ExpressionParserException { + private C_Expression getSoundex(Expression exp) throws ExpressionParserException { Soundex e = (Soundex) exp; C_Expression arg = parse(e.getArgument()); C_Soundex soundex = new C_Soundex(arg); return soundex; } - private C_Expression getLevenshtein(Expression exp) - throws ExpressionParserException { + private C_Expression getLevenshtein(Expression exp) throws ExpressionParserException { Levenshtein e = (Levenshtein) exp; C_Expression left = parse(e.getLeftArgument()); C_Expression right = parse(e.getRightArgument()); @@ -758,8 +711,7 @@ public class C_ExpressionParser { return levenshtein; } - private C_Expression getSimilarity(Expression exp) - throws ExpressionParserException { + private C_Expression getSimilarity(Expression exp) throws ExpressionParserException { Similarity e = (Similarity) exp; C_Expression left = parse(e.getLeftArgument()); C_Expression right = parse(e.getRightArgument()); @@ -768,8 +720,7 @@ public class C_ExpressionParser { return similarity; } - private C_Expression getEquals(Expression exp) - throws ExpressionParserException { + private C_Expression getEquals(Expression exp) throws ExpressionParserException { Equals e = (Equals) exp; C_Expression left = parse(e.getLeftArgument()); C_Expression right = parse(e.getRightArgument()); @@ -777,159 +728,129 @@ public class C_ExpressionParser { return eq; } - private C_Expression getConcat(Expression exp) - throws ExpressionParserException { + private C_Expression getConcat(Expression exp) throws ExpressionParserException { Concat concat = (Concat) exp; - C_Concat conc = new C_Concat(parse(concat.getLeftArgument()), - parse(concat.getRightArgument())); + C_Concat conc = new C_Concat(parse(concat.getLeftArgument()), parse(concat.getRightArgument())); return conc; } - private C_Expression getSubstringByIndex(Expression exp) - throws ExpressionParserException { + private C_Expression getSubstringByIndex(Expression exp) throws ExpressionParserException { SubstringByIndex subByIndex = (SubstringByIndex) exp; - C_SubstringByIndex sByIndex = new C_SubstringByIndex( - parse(subByIndex.getSourceString()), - parse(subByIndex.getFromIndex()), - parse(subByIndex.getToIndex())); + C_SubstringByIndex sByIndex = new C_SubstringByIndex(parse(subByIndex.getSourceString()), + parse(subByIndex.getFromIndex()), parse(subByIndex.getToIndex())); return sByIndex; } - private C_Expression getSubstringByRegex(Expression exp) - throws ExpressionParserException { + private C_Expression getSubstringByRegex(Expression exp) throws ExpressionParserException { SubstringByRegex subByRegex = (SubstringByRegex) exp; - C_SubstringByRegex sByRegex = new C_SubstringByRegex( - parse(subByRegex.getLeftArgument()), + C_SubstringByRegex sByRegex = new C_SubstringByRegex(parse(subByRegex.getLeftArgument()), parse(subByRegex.getRightArgument())); return sByRegex; } - private C_Expression getSubstringPosition(Expression exp) - throws ExpressionParserException { + private C_Expression getSubstringPosition(Expression exp) throws ExpressionParserException { SubstringPosition subPosition = (SubstringPosition) exp; - C_SubstringPosition sPosition = new C_SubstringPosition( - parse(subPosition.getLeftArgument()), + C_SubstringPosition sPosition = new C_SubstringPosition(parse(subPosition.getLeftArgument()), parse(subPosition.getRightArgument())); return sPosition; } - private C_Expression getTextReplaceMatchingRegex(Expression exp) - throws ExpressionParserException { + private C_Expression getTextReplaceMatchingRegex(Expression exp) throws ExpressionParserException { TextReplaceMatchingRegex textReplaceMatchingRegex = (TextReplaceMatchingRegex) exp; - TD_Value replacing = getExpressionValue(textReplaceMatchingRegex - .getReplacingValue()); - TD_Value regexp = getExpressionValue(textReplaceMatchingRegex - .getRegexp()); - C_Expression toCheckText = parse(textReplaceMatchingRegex - .getToCheckText()); + TD_Value replacing = getExpressionValue(textReplaceMatchingRegex.getReplacingValue()); + TD_Value regexp = getExpressionValue(textReplaceMatchingRegex.getRegexp()); + C_Expression toCheckText = parse(textReplaceMatchingRegex.getToCheckText()); - C_TextReplaceMatchingRegex textRepRegex = new C_TextReplaceMatchingRegex( - toCheckText, regexp, replacing); + C_TextReplaceMatchingRegex textRepRegex = new C_TextReplaceMatchingRegex(toCheckText, regexp, replacing); return textRepRegex; } - private C_Expression getAvg(Expression exp) - throws ExpressionParserException { + private C_Expression getAvg(Expression exp) throws ExpressionParserException { Avg avg = (Avg) exp; C_Avg av = new C_Avg(parse(avg.getArgument())); return av; } - private C_Expression getCount(Expression exp) - throws ExpressionParserException { + private C_Expression getCount(Expression exp) throws ExpressionParserException { Count count = (Count) exp; C_Count cnt = new C_Count(parse(count.getArgument())); return cnt; } - private C_Expression getMax(Expression exp) - throws ExpressionParserException { + private C_Expression getMax(Expression exp) throws ExpressionParserException { Max max = (Max) exp; C_Max ma = new C_Max(parse(max.getArgument())); return ma; } - private C_Expression getMin(Expression exp) - throws ExpressionParserException { + private C_Expression getMin(Expression exp) throws ExpressionParserException { Min min = (Min) exp; C_Min mi = new C_Min(parse(min.getArgument())); return mi; } - private C_Expression getSTExtent(Expression exp) - throws ExpressionParserException { + private C_Expression getSTExtent(Expression exp) throws ExpressionParserException { ST_Extent stExtent = (ST_Extent) exp; C_ST_Extent stEx = new C_ST_Extent(parse(stExtent.getArgument())); return stEx; } - private C_Expression getSum(Expression exp) - throws ExpressionParserException { + private C_Expression getSum(Expression exp) throws ExpressionParserException { Sum sum = (Sum) exp; C_Sum sm = new C_Sum(parse(sum.getArgument())); return sm; } - private C_Expression getCast(Expression exp) - throws ExpressionParserException { + private C_Expression getCast(Expression exp) throws ExpressionParserException { Cast castExp = (Cast) exp; - C_Cast sm = new C_Cast(parse(castExp.getArgument()), - mapColumnDataType(castExp.getCastToType())); + C_Cast sm = new C_Cast(parse(castExp.getArgument()), mapColumnDataType(castExp.getCastToType())); return sm; } - private C_Expression getAddition(Expression exp) - throws ExpressionParserException { + private C_Expression getAddition(Expression exp) throws ExpressionParserException { Addition addition = (Addition) exp; - C_Addition add = new C_Addition(parse(addition.getLeftArgument()), - parse(addition.getRightArgument())); + C_Addition add = new C_Addition(parse(addition.getLeftArgument()), parse(addition.getRightArgument())); return add; } - private C_Expression getSubtraction(Expression exp) - throws ExpressionParserException { + private C_Expression getSubtraction(Expression exp) throws ExpressionParserException { Subtraction subtraction = (Subtraction) exp; - C_Subtraction sub = new C_Subtraction( - parse(subtraction.getLeftArgument()), + C_Subtraction sub = new C_Subtraction(parse(subtraction.getLeftArgument()), parse(subtraction.getRightArgument())); return sub; } - private C_Expression getModulus(Expression exp) - throws ExpressionParserException { + private C_Expression getModulus(Expression exp) throws ExpressionParserException { Modulus modulus = (Modulus) exp; - C_Modulus modu = new C_Modulus(parse(modulus.getLeftArgument()), - parse(modulus.getRightArgument())); + C_Modulus modu = new C_Modulus(parse(modulus.getLeftArgument()), parse(modulus.getRightArgument())); return modu; } - private C_Expression getMultiplication(Expression exp) - throws ExpressionParserException { + private C_Expression getMultiplication(Expression exp) throws ExpressionParserException { Multiplication multiplication = (Multiplication) exp; - C_Multiplication multi = new C_Multiplication( - parse(multiplication.getLeftArgument()), + C_Multiplication multi = new C_Multiplication(parse(multiplication.getLeftArgument()), parse(multiplication.getRightArgument())); return multi; } - private C_Expression getDivision(Expression exp) - throws ExpressionParserException { + private C_Expression getDivision(Expression exp) throws ExpressionParserException { Division division = (Division) exp; - C_Division divi = new C_Division(parse(division.getLeftArgument()), - parse(division.getRightArgument())); + C_Division divi = new C_Division(parse(division.getLeftArgument()), parse(division.getRightArgument())); return divi; } /** * * @param exp - * @return + * Client expression + * @return Expression * @throws ExpressionParserException + * Exception */ public Expression parse(C_Expression exp) throws ExpressionParserException { logger.debug("Parse: " + exp); Expression ex = null; - + switch (exp.getId()) { case "ColumnReferencePlaceholder": ex = getColumnReferencePlaceholder(exp); @@ -1080,8 +1001,7 @@ public class C_ExpressionParser { return ex; } - public MultivaluedExpression parseMultivalued(C_MultivaluedExpression exp) - throws ExpressionParserException { + public MultivaluedExpression parseMultivalued(C_MultivaluedExpression exp) throws ExpressionParserException { MultivaluedExpression ex = null; switch (exp.getIdMulti()) { case "ConstantList": @@ -1095,13 +1015,10 @@ public class C_ExpressionParser { return ex; } - private Expression getValueIsIn(C_Expression exp) - throws ExpressionParserException { + private Expression getValueIsIn(C_Expression exp) throws ExpressionParserException { C_ValueIsIn v = (C_ValueIsIn) exp; - MultivaluedExpression multivalued = parseMultivalued(v - .getRightArgument()); - ValueIsIn valueIsIn = new ValueIsIn(parse(v.getLeftArgument()), - multivalued); + MultivaluedExpression multivalued = parseMultivalued(v.getRightArgument()); + ValueIsIn valueIsIn = new ValueIsIn(parse(v.getLeftArgument()), multivalued); return valueIsIn; } @@ -1118,38 +1035,33 @@ public class C_ExpressionParser { return or; } - private Expression getNot(C_Expression exp) - throws ExpressionParserException { + private Expression getNot(C_Expression exp) throws ExpressionParserException { C_Not n = (C_Not) exp; Not not = new Not(parse(n.getArgument())); return not; } - private Expression getIsNull(C_Expression exp) - throws ExpressionParserException { + private Expression getIsNull(C_Expression exp) throws ExpressionParserException { C_IsNull nullIs = (C_IsNull) exp; IsNull isNull = new IsNull(parse(nullIs.getArgument())); return isNull; } - private Expression getIsNotNull(C_Expression exp) - throws ExpressionParserException { + private Expression getIsNotNull(C_Expression exp) throws ExpressionParserException { C_IsNotNull nullNotIs = (C_IsNotNull) exp; IsNotNull isNotNull = new IsNotNull(parse(nullNotIs.getArgument())); return isNotNull; } - private Expression getBetween(C_Expression exp) - throws ExpressionParserException { + private Expression getBetween(C_Expression exp) throws ExpressionParserException { C_Between bet = (C_Between) exp; - Between between = new Between(parse(bet.getLeftArgument()), - parse(bet.getMinRangeArgument()), parse(bet.getMaxRangeArgument())); + Between between = new Between(parse(bet.getLeftArgument()), parse(bet.getMinRangeArgument()), + parse(bet.getMaxRangeArgument())); return between; } - private Expression getAnd(C_Expression exp) - throws ExpressionParserException { + private Expression getAnd(C_Expression exp) throws ExpressionParserException { C_And o = (C_And) exp; List listCExp = o.getArguments(); List listExp = new ArrayList(); @@ -1162,104 +1074,81 @@ public class C_ExpressionParser { return and; } - private Expression getTextMatchSQLRegexp(C_Expression exp) - throws ExpressionParserException { + private Expression getTextMatchSQLRegexp(C_Expression exp) throws ExpressionParserException { C_TextMatchSQLRegexp reg = (C_TextMatchSQLRegexp) exp; - TextMatchSQLRegexp regExp = new TextMatchSQLRegexp( - parse(reg.getLeftArgument()), parse(reg.getRightArgument())); + TextMatchSQLRegexp regExp = new TextMatchSQLRegexp(parse(reg.getLeftArgument()), parse(reg.getRightArgument())); return regExp; } - private Expression getTextEndWith(C_Expression exp) - throws ExpressionParserException { + private Expression getTextEndWith(C_Expression exp) throws ExpressionParserException { C_TextEndsWith textEnd = (C_TextEndsWith) exp; - TextEndsWith textEndWith = new TextEndsWith( - parse(textEnd.getLeftArgument()), + TextEndsWith textEndWith = new TextEndsWith(parse(textEnd.getLeftArgument()), parse(textEnd.getRightArgument())); return textEndWith; } - private Expression getTextContains(C_Expression exp) - throws ExpressionParserException { + private Expression getTextContains(C_Expression exp) throws ExpressionParserException { C_TextContains textContains = (C_TextContains) exp; - TextContains textCont = new TextContains( - parse(textContains.getLeftArgument()), + TextContains textCont = new TextContains(parse(textContains.getLeftArgument()), parse(textContains.getRightArgument())); return textCont; } - private Expression getTextBeginWith(C_Expression exp) - throws ExpressionParserException { + private Expression getTextBeginWith(C_Expression exp) throws ExpressionParserException { C_TextBeginsWith textB = (C_TextBeginsWith) exp; - TextBeginsWith textBegins = new TextBeginsWith( - parse(textB.getLeftArgument()), parse(textB.getRightArgument())); + TextBeginsWith textBegins = new TextBeginsWith(parse(textB.getLeftArgument()), parse(textB.getRightArgument())); return textBegins; } - private Expression getNotLess(C_Expression exp) - throws ExpressionParserException { + private Expression getNotLess(C_Expression exp) throws ExpressionParserException { C_NotLess notL = (C_NotLess) exp; - NotLess notLess = new NotLess(parse(notL.getLeftArgument()), - parse(notL.getRightArgument())); + NotLess notLess = new NotLess(parse(notL.getLeftArgument()), parse(notL.getRightArgument())); return notLess; } - private Expression getNotGreater(C_Expression exp) - throws ExpressionParserException { + private Expression getNotGreater(C_Expression exp) throws ExpressionParserException { C_NotGreater notG = (C_NotGreater) exp; - NotGreater notGreater = new NotGreater(parse(notG.getLeftArgument()), - parse(notG.getRightArgument())); + NotGreater notGreater = new NotGreater(parse(notG.getLeftArgument()), parse(notG.getRightArgument())); return notGreater; } - private Expression getNotEquals(C_Expression exp) - throws ExpressionParserException { + private Expression getNotEquals(C_Expression exp) throws ExpressionParserException { C_NotEquals notE = (C_NotEquals) exp; - NotEquals notEquals = new NotEquals(parse(notE.getLeftArgument()), - parse(notE.getRightArgument())); + NotEquals notEquals = new NotEquals(parse(notE.getLeftArgument()), parse(notE.getRightArgument())); return notEquals; } - private Expression getLessThan(C_Expression exp) - throws ExpressionParserException { + private Expression getLessThan(C_Expression exp) throws ExpressionParserException { C_LessThan lessT = (C_LessThan) exp; - LessThan lessThan = new LessThan(parse(lessT.getLeftArgument()), - parse(lessT.getRightArgument())); + LessThan lessThan = new LessThan(parse(lessT.getLeftArgument()), parse(lessT.getRightArgument())); return lessThan; } - private Expression getLessOrEquals(C_Expression exp) - throws ExpressionParserException { + private Expression getLessOrEquals(C_Expression exp) throws ExpressionParserException { C_LessOrEquals lessOrE = (C_LessOrEquals) exp; - LessOrEquals lessOrEquals = new LessOrEquals( - parse(lessOrE.getLeftArgument()), + LessOrEquals lessOrEquals = new LessOrEquals(parse(lessOrE.getLeftArgument()), parse(lessOrE.getRightArgument())); return lessOrEquals; } - private Expression getGreaterThan(C_Expression exp) - throws ExpressionParserException { + private Expression getGreaterThan(C_Expression exp) throws ExpressionParserException { C_GreaterThan greaterThan = (C_GreaterThan) exp; - GreaterThan greater = new GreaterThan( - parse(greaterThan.getLeftArgument()), + GreaterThan greater = new GreaterThan(parse(greaterThan.getLeftArgument()), parse(greaterThan.getRightArgument())); return greater; } - private Expression getGreaterOrEquals(C_Expression exp) - throws ExpressionParserException { + private Expression getGreaterOrEquals(C_Expression exp) throws ExpressionParserException { C_GreaterOrEquals greaterOrEq = (C_GreaterOrEquals) exp; - GreaterOrEquals greaterOrEquals = new GreaterOrEquals( - parse(greaterOrEq.getLeftArgument()), + GreaterOrEquals greaterOrEquals = new GreaterOrEquals(parse(greaterOrEq.getLeftArgument()), parse(greaterOrEq.getRightArgument())); return greaterOrEquals; } - private TDTypeValue getExpressionValue(TD_Value value) - throws ExpressionParserException { + private TDTypeValue getExpressionValue(TD_Value value) throws ExpressionParserException { TDTypeValue ex = null; try { @@ -1273,8 +1162,7 @@ public class C_ExpressionParser { d = sdf.parse(value.getValue()); } catch (ParseException e) { logger.error("Unparseable using " + sdf); - throw new ExpressionParserException(value.getValue() - + " is not valid Date type"); + throw new ExpressionParserException(value.getValue() + " is not valid Date type"); } ex = new TDDate(d); break; @@ -1282,8 +1170,7 @@ public class C_ExpressionParser { if (TDGeometry.validateGeometry(value.getValue())) { ex = new TDGeometry(value.getValue()); } else { - throw new ExpressionParserException(value.getValue() - + " is not valid Geometry type"); + throw new ExpressionParserException(value.getValue() + " is not valid Geometry type"); } break; case Integer: @@ -1291,8 +1178,7 @@ public class C_ExpressionParser { try { vInteger = Integer.valueOf(value.getValue()); } catch (NumberFormatException e) { - throw new ExpressionParserException(value.getValue() - + " is not valid Integer type"); + throw new ExpressionParserException(value.getValue() + " is not valid Integer type"); } ex = new TDInteger(vInteger); break; @@ -1301,8 +1187,7 @@ public class C_ExpressionParser { try { vNumeric = Double.valueOf(value.getValue()); } catch (NumberFormatException e) { - throw new ExpressionParserException(value.getValue() - + " is not valid Double type"); + throw new ExpressionParserException(value.getValue() + " is not valid Double type"); } ex = new TDNumeric(vNumeric); break; @@ -1317,8 +1202,7 @@ public class C_ExpressionParser { break; } } catch (Throwable e) { - logger.error("type error parsing value " + value + " " - + e.getLocalizedMessage()); + logger.error("type error parsing value " + value + " " + e.getLocalizedMessage()); } return ex; } @@ -1351,8 +1235,7 @@ public class C_ExpressionParser { } } - private Expression getConstantlist(C_Expression exp) - throws ExpressionParserException { + private Expression getConstantlist(C_Expression exp) throws ExpressionParserException { List l = new ArrayList(); C_ConstantList c = (C_ConstantList) exp; List arguments = c.getArguments(); @@ -1365,8 +1248,7 @@ public class C_ExpressionParser { return constList; } - private MultivaluedExpression getConstantlist(C_MultivaluedExpression exp) - throws ExpressionParserException { + private MultivaluedExpression getConstantlist(C_MultivaluedExpression exp) throws ExpressionParserException { List l = new ArrayList(); C_ConstantList c = (C_ConstantList) exp; List arguments = c.getArguments(); @@ -1381,12 +1263,11 @@ public class C_ExpressionParser { private Expression getColumnReferencePlaceholder(C_Expression exp) { C_ColumnReferencePlaceholder c = (C_ColumnReferencePlaceholder) exp; - ColumnReferencePlaceholder col = new ColumnReferencePlaceholder( - mapColumnDataType(c.getDataType()), c.getColumnId(), c.getLabel()); + ColumnReferencePlaceholder col = new ColumnReferencePlaceholder(mapColumnDataType(c.getDataType()), + c.getColumnId(), c.getLabel()); return col; } - private Expression getColumnReference(C_Expression exp) { C_ColumnReference c = (C_ColumnReference) exp; String tableIdS = null; @@ -1403,48 +1284,42 @@ public class C_ExpressionParser { return ref; } - private Expression getUpper(C_Expression exp) - throws ExpressionParserException { + private Expression getUpper(C_Expression exp) throws ExpressionParserException { C_Upper e = (C_Upper) exp; Expression arg = parse(e.getArgument()); Upper upper = new Upper(arg); return upper; } - private Expression getLower(C_Expression exp) - throws ExpressionParserException { + private Expression getLower(C_Expression exp) throws ExpressionParserException { C_Lower e = (C_Lower) exp; Expression arg = parse(e.getArgument()); Lower lower = new Lower(arg); return lower; } - private Expression getTrim(C_Expression exp) - throws ExpressionParserException { + private Expression getTrim(C_Expression exp) throws ExpressionParserException { C_Trim e = (C_Trim) exp; Expression arg = parse(e.getArgument()); Trim trim = new Trim(arg); return trim; } - private Expression getMD5(C_Expression exp) - throws ExpressionParserException { + private Expression getMD5(C_Expression exp) throws ExpressionParserException { C_MD5 e = (C_MD5) exp; Expression arg = parse(e.getArgument()); MD5 md5 = new MD5(arg); return md5; } - private Expression getSoundex(C_Expression exp) - throws ExpressionParserException { + private Expression getSoundex(C_Expression exp) throws ExpressionParserException { C_Soundex e = (C_Soundex) exp; Expression arg = parse(e.getArgument()); Soundex soundex = new Soundex(arg); return soundex; } - private Expression getLevenshtein(C_Expression exp) - throws ExpressionParserException { + private Expression getLevenshtein(C_Expression exp) throws ExpressionParserException { C_Levenshtein e = (C_Levenshtein) exp; Expression left = parse(e.getLeftArgument()); Expression right = parse(e.getRightArgument()); @@ -1453,8 +1328,7 @@ public class C_ExpressionParser { return levenshtein; } - private Expression getSimilarity(C_Expression exp) - throws ExpressionParserException { + private Expression getSimilarity(C_Expression exp) throws ExpressionParserException { C_Similarity e = (C_Similarity) exp; Expression left = parse(e.getLeftArgument()); Expression right = parse(e.getRightArgument()); @@ -1463,8 +1337,7 @@ public class C_ExpressionParser { return similarity; } - private Expression getEquals(C_Expression exp) - throws ExpressionParserException { + private Expression getEquals(C_Expression exp) throws ExpressionParserException { C_Equals e = (C_Equals) exp; Expression left = parse(e.getLeftArgument()); Expression right = parse(e.getRightArgument()); @@ -1472,47 +1345,36 @@ public class C_ExpressionParser { return eq; } - private Expression getConcat(C_Expression exp) - throws ExpressionParserException { + private Expression getConcat(C_Expression exp) throws ExpressionParserException { C_Concat concat = (C_Concat) exp; - Concat conc = new Concat(parse(concat.getLeftArgument()), - parse(concat.getRightArgument())); + Concat conc = new Concat(parse(concat.getLeftArgument()), parse(concat.getRightArgument())); return conc; } - private Expression getSubstringByIndex(C_Expression exp) - throws ExpressionParserException { + private Expression getSubstringByIndex(C_Expression exp) throws ExpressionParserException { C_SubstringByIndex subByIndex = (C_SubstringByIndex) exp; - SubstringByIndex sByIndex = new SubstringByIndex( - parse(subByIndex.getSourceString()), - parse(subByIndex.getFromIndex()), - parse(subByIndex.getToIndex())); + SubstringByIndex sByIndex = new SubstringByIndex(parse(subByIndex.getSourceString()), + parse(subByIndex.getFromIndex()), parse(subByIndex.getToIndex())); return sByIndex; } - private Expression getSubstringByRegex(C_Expression exp) - throws ExpressionParserException { + private Expression getSubstringByRegex(C_Expression exp) throws ExpressionParserException { C_SubstringByRegex subByRegex = (C_SubstringByRegex) exp; - SubstringByRegex sByRegex = new SubstringByRegex( - parse(subByRegex.getSourceString()), + SubstringByRegex sByRegex = new SubstringByRegex(parse(subByRegex.getSourceString()), parse(subByRegex.getRegex())); return sByRegex; } - private Expression getSubstringPosition(C_Expression exp) - throws ExpressionParserException { + private Expression getSubstringPosition(C_Expression exp) throws ExpressionParserException { C_SubstringPosition subPosition = (C_SubstringPosition) exp; - SubstringPosition sPosition = new SubstringPosition( - parse(subPosition.getLeftArgument()), + SubstringPosition sPosition = new SubstringPosition(parse(subPosition.getLeftArgument()), parse(subPosition.getRightArgument())); return sPosition; } - private Expression getTextReplaceMatchingRegex(C_Expression exp) - throws ExpressionParserException { + private Expression getTextReplaceMatchingRegex(C_Expression exp) throws ExpressionParserException { C_TextReplaceMatchingRegex textReplaceMatchingRegex = (C_TextReplaceMatchingRegex) exp; - TDText tdRegexp = new TDText(textReplaceMatchingRegex.getRegexp() - .getValue()); + TDText tdRegexp = new TDText(textReplaceMatchingRegex.getRegexp().getValue()); String replacement = textReplaceMatchingRegex.getReplacing().getValue(); if (replacement == null) { @@ -1521,99 +1383,80 @@ public class C_ExpressionParser { TDText tdReplacing = new TDText(replacement); TextReplaceMatchingRegex textRepRegex = new TextReplaceMatchingRegex( - parse(textReplaceMatchingRegex.getToCheckText()), tdRegexp, - tdReplacing); + parse(textReplaceMatchingRegex.getToCheckText()), tdRegexp, tdReplacing); return textRepRegex; } - private Expression getAvg(C_Expression exp) - throws ExpressionParserException { + private Expression getAvg(C_Expression exp) throws ExpressionParserException { C_Avg avg = (C_Avg) exp; Avg av = new Avg(parse(avg.getArgument())); return av; } - private Expression getCount(C_Expression exp) - throws ExpressionParserException { + private Expression getCount(C_Expression exp) throws ExpressionParserException { C_Count count = (C_Count) exp; Count cnt = new Count(parse(count.getArgument())); return cnt; } - private Expression getMax(C_Expression exp) - throws ExpressionParserException { + private Expression getMax(C_Expression exp) throws ExpressionParserException { C_Max max = (C_Max) exp; Max ma = new Max(parse(max.getArgument())); return ma; } - private Expression getMin(C_Expression exp) - throws ExpressionParserException { + private Expression getMin(C_Expression exp) throws ExpressionParserException { C_Min min = (C_Min) exp; Min mi = new Min(parse(min.getArgument())); return mi; } - private Expression getSTExtent(C_Expression exp) - throws ExpressionParserException { + private Expression getSTExtent(C_Expression exp) throws ExpressionParserException { C_ST_Extent stExtent = (C_ST_Extent) exp; ST_Extent stEx = new ST_Extent(parse(stExtent.getArgument())); return stEx; } - private Expression getSum(C_Expression exp) - throws ExpressionParserException { + private Expression getSum(C_Expression exp) throws ExpressionParserException { C_Sum sum = (C_Sum) exp; Sum sm = new Sum(parse(sum.getArgument())); return sm; } - private Expression getCast(C_Expression exp) - throws ExpressionParserException { + private Expression getCast(C_Expression exp) throws ExpressionParserException { C_Cast castExp = (C_Cast) exp; - Cast sm = new Cast(parse(castExp.getLeftArgument()), - mapColumnDataType(castExp.getRightArgument())); + Cast sm = new Cast(parse(castExp.getLeftArgument()), mapColumnDataType(castExp.getRightArgument())); return sm; } - private Expression getAddition(C_Expression exp) - throws ExpressionParserException { + private Expression getAddition(C_Expression exp) throws ExpressionParserException { C_Addition addition = (C_Addition) exp; - Addition add = new Addition(parse(addition.getLeftArgument()), - parse(addition.getRightArgument())); + Addition add = new Addition(parse(addition.getLeftArgument()), parse(addition.getRightArgument())); return add; } - private Expression getSubtraction(C_Expression exp) - throws ExpressionParserException { + private Expression getSubtraction(C_Expression exp) throws ExpressionParserException { C_Subtraction subtraction = (C_Subtraction) exp; - Subtraction sub = new Subtraction(parse(subtraction.getLeftArgument()), - parse(subtraction.getRightArgument())); + Subtraction sub = new Subtraction(parse(subtraction.getLeftArgument()), parse(subtraction.getRightArgument())); return sub; } - private Expression getModulus(C_Expression exp) - throws ExpressionParserException { + private Expression getModulus(C_Expression exp) throws ExpressionParserException { C_Modulus modulus = (C_Modulus) exp; - Modulus modu = new Modulus(parse(modulus.getLeftArgument()), - parse(modulus.getRightArgument())); + Modulus modu = new Modulus(parse(modulus.getLeftArgument()), parse(modulus.getRightArgument())); return modu; } - private Expression getMultiplication(C_Expression exp) - throws ExpressionParserException { + private Expression getMultiplication(C_Expression exp) throws ExpressionParserException { C_Multiplication multiplication = (C_Multiplication) exp; - Multiplication multi = new Multiplication( - parse(multiplication.getLeftArgument()), + Multiplication multi = new Multiplication(parse(multiplication.getLeftArgument()), parse(multiplication.getRightArgument())); return multi; } - private Expression getDivision(C_Expression exp) - throws ExpressionParserException { + private Expression getDivision(C_Expression exp) throws ExpressionParserException { C_Division division = (C_Division) exp; - Division divi = new Division(parse(division.getLeftArgument()), - parse(division.getRightArgument())); + Division divi = new Division(parse(division.getLeftArgument()), parse(division.getRightArgument())); return divi; } 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 acc0501..95e5517 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 @@ -49,8 +49,8 @@ import org.slf4j.LoggerFactory; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ExpressionServiceImpl extends TDGWTServiceImpl implements diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/ExpressionSession.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/ExpressionSession.java index c973d42..3e04e4a 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/ExpressionSession.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/ExpressionSession.java @@ -15,8 +15,8 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.column.ReplaceColumnByExp /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ExpressionSession { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/service/rule/AppliedRulesResponseMap.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/service/rule/AppliedRulesResponseMap.java index c4e1322..fedc0fd 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/service/rule/AppliedRulesResponseMap.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/service/rule/AppliedRulesResponseMap.java @@ -16,8 +16,8 @@ import org.slf4j.LoggerFactory; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AppliedRulesResponseMap { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/service/rule/RuleDescriptionMap.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/service/rule/RuleDescriptionMap.java index 059ff35..eb65275 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/service/rule/RuleDescriptionMap.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/service/rule/RuleDescriptionMap.java @@ -20,8 +20,8 @@ import org.slf4j.LoggerFactory; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class RuleDescriptionMap { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/service/rule/RuleScopeMap.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/service/rule/RuleScopeMap.java index e497bf1..0b22c86 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/service/rule/RuleScopeMap.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/service/rule/RuleScopeMap.java @@ -6,8 +6,8 @@ import org.gcube.portlets.user.td.gwtservice.shared.rule.RuleScopeType; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class RuleScopeMap { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/service/rule/RuleTypeMap.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/service/rule/RuleTypeMap.java index 657c3fa..87a92e3 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/service/rule/RuleTypeMap.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/service/rule/RuleTypeMap.java @@ -25,8 +25,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.DimensionRe /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class RuleTypeMap { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/Constants.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/Constants.java index b7edcd5..4d717e1 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/Constants.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/Constants.java @@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.expressionwidget.shared; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class Constants { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/condition/ConditionOnMultiColumnTypeMap.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/condition/ConditionOnMultiColumnTypeMap.java index 41542a2..7763667 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/condition/ConditionOnMultiColumnTypeMap.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/condition/ConditionOnMultiColumnTypeMap.java @@ -44,8 +44,8 @@ import com.allen_sauer.gwt.log.client.Log; /** * ConditionTypeMap creates a C_Expression usable client-side * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ConditionOnMultiColumnTypeMap { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/condition/ConditionTypeMap.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/condition/ConditionTypeMap.java index 650240f..7b51175 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/condition/ConditionTypeMap.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/condition/ConditionTypeMap.java @@ -42,8 +42,8 @@ import com.allen_sauer.gwt.log.client.Log; /** * ConditionTypeMap creates a C_Expression usable client-side * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ConditionTypeMap { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/exception/ConditionTypeMapException.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/exception/ConditionTypeMapException.java index 0696a9a..834cdb1 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/exception/ConditionTypeMapException.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/exception/ConditionTypeMapException.java @@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.expressionwidget.shared.exception; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ConditionTypeMapException extends Exception { @@ -18,17 +18,23 @@ public class ConditionTypeMapException extends Exception { } /** + * * @param message + * Message */ public ConditionTypeMapException(String message) { super(message); } - - - public ConditionTypeMapException(String message,Throwable t) { - super(message,t); + + /** + * + * @param message + * Message + * @param throwable + * Error + */ + public ConditionTypeMapException(String message, Throwable throwable) { + super(message, throwable); } - } - diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/exception/ExpressionParserException.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/exception/ExpressionParserException.java index 8a7e32b..8545f87 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/exception/ExpressionParserException.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/exception/ExpressionParserException.java @@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.expressionwidget.shared.exception; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ExpressionParserException extends Exception { @@ -15,14 +15,23 @@ public class ExpressionParserException extends Exception { } /** + * * @param message + * Message */ public ExpressionParserException(String message) { super(message); } - public ExpressionParserException(String message, Throwable t) { - super(message, t); + /** + * + * @param message + * Message + * @param throwable + * Error + */ + public ExpressionParserException(String message, Throwable throwable) { + super(message, throwable); } } diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/exception/ExpressionServiceException.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/exception/ExpressionServiceException.java index a02f1e4..c65566c 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/exception/ExpressionServiceException.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/exception/ExpressionServiceException.java @@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.expressionwidget.shared.exception; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ExpressionServiceException extends Exception { @@ -19,16 +19,21 @@ public class ExpressionServiceException extends Exception { /** * @param message + * Message */ public ExpressionServiceException(String message) { super(message); } - - - public ExpressionServiceException(String message,Throwable t) { - super(message,t); + + /** + * + * @param message + * Message + * @param throwable + * Error + */ + public ExpressionServiceException(String message, Throwable throwable) { + super(message, throwable); } - } - diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/exception/ReplaceTypeMapException.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/exception/ReplaceTypeMapException.java index d120609..9e8b23d 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/exception/ReplaceTypeMapException.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/exception/ReplaceTypeMapException.java @@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.expressionwidget.shared.exception; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ReplaceTypeMapException extends Exception { @@ -18,17 +18,23 @@ public class ReplaceTypeMapException extends Exception { } /** + * * @param message + * Message */ public ReplaceTypeMapException(String message) { super(message); } - - - public ReplaceTypeMapException(String message,Throwable t) { - super(message,t); + + /** + * + * @param message + * Message + * @param throwable + * Error + */ + public ReplaceTypeMapException(String message, Throwable throwable) { + super(message, throwable); } - } - diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/C_OperatorType.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/C_OperatorType.java index 326cc32..ff29efc 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/C_OperatorType.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/C_OperatorType.java @@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.expressionwidget.shared.model; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum C_OperatorType { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_AggregationExpression.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_AggregationExpression.java index 21cd241..5aff352 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_AggregationExpression.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_AggregationExpression.java @@ -4,8 +4,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Avg.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Avg.java index 69c1234..7748147 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Avg.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Avg.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Avg extends C_AggregationExpression { @@ -18,10 +18,7 @@ public class C_Avg extends C_AggregationExpression { } - /** - * - * @param argument - */ + public C_Avg(C_Expression argument) { this.argument = argument; if (argument != null) { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Count.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Count.java index ce25fef..6924d5b 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Count.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Count.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Count extends C_AggregationExpression { @@ -18,10 +18,7 @@ public class C_Count extends C_AggregationExpression { } - /** - * - * @param argument - */ + public C_Count(C_Expression argument) { this.argument = argument; if (argument != null) { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Max.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Max.java index 85e25ef..a11642a 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Max.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Max.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Max extends C_AggregationExpression { @@ -18,10 +18,7 @@ public class C_Max extends C_AggregationExpression { } - /** - * - * @param argument - */ + public C_Max(C_Expression argument) { this.argument = argument; if (argument != null) { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Min.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Min.java index 48d8539..7379934 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Min.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Min.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Min extends C_AggregationExpression { @@ -18,10 +18,7 @@ public class C_Min extends C_AggregationExpression { } - /** - * - * @param argument - */ + public C_Min(C_Expression argument) { this.argument = argument; if (argument != null) { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_ST_Extent.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_ST_Extent.java index 4cfa554..526e254 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_ST_Extent.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_ST_Extent.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_ST_Extent extends C_AggregationExpression { @@ -17,15 +17,11 @@ public class C_ST_Extent extends C_AggregationExpression { public C_ST_Extent() { } - /** - * - * @param argument - */ + public C_ST_Extent(C_Expression argument) { this.argument = argument; if (argument != null) { - this.readableExpression = "ST_Extent(" - + argument.getReadableExpression() + ")"; + this.readableExpression = "ST_Extent(" + argument.getReadableExpression() + ")"; } } diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Sum.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Sum.java index 48aae3e..54e16d9 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Sum.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Sum.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Sum extends C_AggregationExpression { @@ -18,10 +18,7 @@ public class C_Sum extends C_AggregationExpression { } - /** - * - * @param argument - */ + public C_Sum(C_Expression argument) { this.argument = argument; if (argument != null) { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Addition.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Addition.java index 818712b..302b3a0 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Addition.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Addition.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Addition extends C_ArithmeticExpression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_ArithmeticExpression.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_ArithmeticExpression.java index 80bc85e..caa10ce 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_ArithmeticExpression.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_ArithmeticExpression.java @@ -7,8 +7,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataT /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_ArithmeticExpression extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Division.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Division.java index 3b28570..a328665 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Division.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Division.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Division extends C_ArithmeticExpression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Exponentiation.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Exponentiation.java index 5f8285a..0d49a93 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Exponentiation.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Exponentiation.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Exponentiation extends C_ArithmeticExpression { @@ -18,10 +18,7 @@ public class C_Exponentiation extends C_ArithmeticExpression { } - /** - * - * @param argument - */ + public C_Exponentiation(C_Expression leftArgument, C_Expression rightArgument) { this.leftArgument = leftArgument; diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Modulus.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Modulus.java index 8146077..64fac84 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Modulus.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Modulus.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Modulus extends C_ArithmeticExpression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Multiplication.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Multiplication.java index 5440563..9b51829 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Multiplication.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Multiplication.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Multiplication extends C_ArithmeticExpression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Subtraction.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Subtraction.java index 825ffb8..d20f03e 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Subtraction.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Subtraction.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Subtraction extends C_ArithmeticExpression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_Equals.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_Equals.java index 0bbe56c..328a3eb 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_Equals.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_Equals.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Equals extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_GreaterOrEquals.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_GreaterOrEquals.java index b8c7f02..27f90e8 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_GreaterOrEquals.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_GreaterOrEquals.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_GreaterOrEquals extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_GreaterThan.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_GreaterThan.java index 7ff28a1..77b14f0 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_GreaterThan.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_GreaterThan.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_GreaterThan extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_LessOrEquals.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_LessOrEquals.java index f49c387..576ad2d 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_LessOrEquals.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_LessOrEquals.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_LessOrEquals extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_LessThan.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_LessThan.java index b7b768f..07beae9 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_LessThan.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_LessThan.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_LessThan extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_NotEquals.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_NotEquals.java index ee9c76c..feffc88 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_NotEquals.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_NotEquals.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_NotEquals extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_NotGreater.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_NotGreater.java index 8ca2b42..f6ce73f 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_NotGreater.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_NotGreater.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_NotGreater extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_NotLess.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_NotLess.java index 1dc086a..eeb382d 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_NotLess.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_NotLess.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_NotLess extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/functions/C_Cast.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/functions/C_Cast.java index 65588f6..03c0c5d 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/functions/C_Cast.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/functions/C_Cast.java @@ -6,8 +6,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataT /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Cast extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Concat.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Concat.java index 70f9dd6..f287153 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Concat.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Concat.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Concat extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Lenght.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Lenght.java index 06006d0..167f74b 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Lenght.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Lenght.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Lenght extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Levenshtein.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Levenshtein.java index 5585951..a427eef 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Levenshtein.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Levenshtein.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Levenshtein extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Lower.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Lower.java index d873a16..ab4001d 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Lower.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Lower.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Lower extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_MD5.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_MD5.java index 67f96aa..b336816 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_MD5.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_MD5.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_MD5 extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Similarity.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Similarity.java index 880bc2c..b4f0333 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Similarity.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Similarity.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Similarity extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Soundex.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Soundex.java index 8ba0029..5e19083 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Soundex.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Soundex.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Soundex extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_SubstringByIndex.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_SubstringByIndex.java index d24597b..a8c2fa3 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_SubstringByIndex.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_SubstringByIndex.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_SubstringByIndex extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_SubstringByRegex.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_SubstringByRegex.java index ec14073..9576bc9 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_SubstringByRegex.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_SubstringByRegex.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_SubstringByRegex extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_SubstringPosition.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_SubstringPosition.java index 2ed25e2..e0a343c 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_SubstringPosition.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_SubstringPosition.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_SubstringPosition extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextBeginsWith.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextBeginsWith.java index d3ff071..06f430a 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextBeginsWith.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextBeginsWith.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_TextBeginsWith extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextContains.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextContains.java index a9e52ca..e46f9c7 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextContains.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextContains.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_TextContains extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextEndsWith.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextEndsWith.java index ee9f454..90e9f8d 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextEndsWith.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextEndsWith.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_TextEndsWith extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextMatchSQLRegexp.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextMatchSQLRegexp.java index baf003d..bbb36d4 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextMatchSQLRegexp.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextMatchSQLRegexp.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_TextMatchSQLRegexp extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextReplaceMatchingRegex.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextReplaceMatchingRegex.java index d114ef9..53c3e1a 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextReplaceMatchingRegex.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextReplaceMatchingRegex.java @@ -6,8 +6,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_TextReplaceMatchingRegex extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Trim.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Trim.java index 96940cd..9cecbc8 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Trim.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Trim.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Trim extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Upper.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Upper.java index a73251e..7f3196f 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Upper.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Upper.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Upper extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/C_ColumnReference.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/C_ColumnReference.java index aea81c6..dc94fe0 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/C_ColumnReference.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/C_ColumnReference.java @@ -4,8 +4,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_ColumnReference extends C_Leaf { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/C_ColumnReferencePlaceholder.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/C_ColumnReferencePlaceholder.java index 9ad3d9d..e2043d9 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/C_ColumnReferencePlaceholder.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/C_ColumnReferencePlaceholder.java @@ -4,8 +4,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataT /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_ColumnReferencePlaceholder extends C_Leaf { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/C_ConstantList.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/C_ConstantList.java index 8264bf9..ef45e5a 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/C_ConstantList.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/C_ConstantList.java @@ -6,8 +6,8 @@ import org.gcube.portlets.user.td.expressionwidget.shared.expression.C_Multivalu /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_ConstantList extends C_Leaf implements C_MultivaluedExpression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/C_Leaf.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/C_Leaf.java index c90be12..4a1871f 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/C_Leaf.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/C_Leaf.java @@ -4,8 +4,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Leaf extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/TD_Value.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/TD_Value.java index af1c806..82ef6ed 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/TD_Value.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/TD_Value.java @@ -4,8 +4,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataT /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class TD_Value extends C_Leaf { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_And.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_And.java index 7c983fd..d6dbfc7 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_And.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_And.java @@ -8,8 +8,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_And extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Between.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Between.java index c848a64..fcd0e67 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Between.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Between.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Between extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_IsNotNull.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_IsNotNull.java index 5a912e6..5277f5d 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_IsNotNull.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_IsNotNull.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_IsNotNull extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_IsNull.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_IsNull.java index 7412c84..af234e8 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_IsNull.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_IsNull.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_IsNull extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Not.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Not.java index a43c466..e249075 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Not.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Not.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Not extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Or.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Or.java index e9bf5a2..357881c 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Or.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Or.java @@ -8,8 +8,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Or extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_ValueIsIn.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_ValueIsIn.java index 3affad5..33394da 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_ValueIsIn.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_ValueIsIn.java @@ -6,8 +6,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_ValueIsIn extends C_Expression { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/replace/ReplaceType.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/replace/ReplaceType.java index e9e55b5..3f2de86 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/replace/ReplaceType.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/replace/ReplaceType.java @@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.expressionwidget.shared.replace; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum ReplaceType { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/replace/ReplaceTypeMap.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/replace/ReplaceTypeMap.java index 3e5362f..2d56735 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/replace/ReplaceTypeMap.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/replace/ReplaceTypeMap.java @@ -28,8 +28,8 @@ import com.allen_sauer.gwt.log.client.Log; /** * ReplaceTypeMap creates a C_Expression usable client-side * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ReplaceTypeMap { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/rule/RuleDescriptionDataProperties.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/rule/RuleDescriptionDataProperties.java index 12ff67a..3abdab2 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/rule/RuleDescriptionDataProperties.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/rule/RuleDescriptionDataProperties.java @@ -11,8 +11,8 @@ import com.sencha.gxt.data.shared.PropertyAccess; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface RuleDescriptionDataProperties extends diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/rule/RuleDescriptionDataPropertiesCombo.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/rule/RuleDescriptionDataPropertiesCombo.java index 6e19636..a17cbed 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/rule/RuleDescriptionDataPropertiesCombo.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/rule/RuleDescriptionDataPropertiesCombo.java @@ -10,8 +10,8 @@ import com.sencha.gxt.data.shared.PropertyAccess; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface RuleDescriptionDataPropertiesCombo extends