diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java index 0dcef13..02bb512 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java +++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java @@ -4,6 +4,7 @@ package org.gcube.portlets.user.td.client; import java.util.ArrayList; +import java.util.HashMap; import org.gcube.portlets.user.td.chartswidget.client.ChartsWidgetTD; import org.gcube.portlets.user.td.client.logs.TDMLogs; @@ -63,9 +64,11 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.CellData; import org.gcube.portlets.user.td.widgetcommonevent.shared.GridHeaderOperationId; import org.gcube.portlets.user.td.widgetcommonevent.shared.GridOperationId; import org.gcube.portlets.user.td.widgetcommonevent.shared.RequestProperties; +import org.gcube.portlets.user.td.widgetcommonevent.shared.RequestPropertiesParameterType; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import org.gcube.portlets.user.td.widgetcommonevent.shared.dataview.DataView; import org.gcube.portlets.user.td.widgetcommonevent.shared.dataview.TabularResourceDataView; +import org.gcube.portlets.user.td.widgetcommonevent.shared.geospatial.GeospatialCoordinatesType; import org.gcube.portlets.user.td.widgetcommonevent.shared.grid.model.RowRaw; import org.gcube.portlets.user.td.wizardwidget.client.WizardListener; import org.gcube.portlets.user.tdtemplate.client.TdTemplateController; @@ -741,30 +744,30 @@ public class TabularDataController { break; case PROPERTIES: break; - case IMPORTSDMX: + case IMPORT_SDMX: openSDMXImportWizard(); break; - case IMPORTCSV: + case IMPORT_CSV: openCSVImportWizard(); break; - case IMPORTJSON: + case IMPORT_JSON: break; - case EXPORTSDMX: + case EXPORT_SDMX: openSDMXExportWizard(); break; - case EXPORTCSV: + case EXPORT_CSV: openCSVExportWizard(); break; - case EXPORTJSON: + case EXPORT_JSON: openJSONExportWizard(); break; - case TEMPLATEOPEN: + case TEMPLATE_OPEN: openTemplateOpen(); break; - case TEMPLATENEW: + case TEMPLATE_NEW: openTemplateNew(); break; - case TEMPLATEDELETE: + case TEMPLATE_DELETE: openTemplateDelete(); break; case SHARE: @@ -773,7 +776,7 @@ public class TabularDataController { case TIMELINE: openTasksManagerWizard(); break; - case BACKGROUNDTASKS: + case BACKGROUND_TASKS: openBackgroundMonitor(); break; case HISTORY: @@ -781,42 +784,42 @@ public class TabularDataController { case UNDO: callDiscard(); break; - case DISCARDALL: + case DISCARD_ALL: break; case HELP: break; case LOGS: openLogsWindow(); break; - case RULENEW: + case RULE_NEW: break; - case RULEMANAGE: + case RULE_MANAGE: break; - case DUPLICATEDETECTION: + case DUPLICATE_DETECTION: openDuplicatesRows(); break; - case TEMPLATEAPPLY: + case TEMPLATE_APPLY: openTemplateApply(); break; - case TABLETYPE: + case TABLE_TYPE: openTableType(); break; - case COLUMNLABEL: + case COLUMN_LABEL: openColumnLabel(); break; - case COLUMNTYPE: + case COLUMN_TYPE: openChangeColumnType(); break; - case COLUMNADD: + case COLUMN_ADD: openColumnAdd(); break; - case COLUMNDELETE: + case COLUMN_DELETE: openColumnDelete(); break; - case COLUMNSPLIT: + case COLUMN_SPLIT: openColumnSplit(); break; - case COLUMNMERGE: + case COLUMN_MERGE: openColumnMerge(); break; case DENORMALIZE: @@ -825,70 +828,76 @@ public class TabularDataController { case NORMALIZE: openNormalize(); break; - case EXTRACTCODELIST: + case EXTRACT_CODELIST: openExtractCodelistWizard(); break; - case CODELISTMAPPING: + case CODELIST_MAPPING: openCodelistMappingWizard(); break; - case GENERATESUMMARY: + case GENERATE_SUMMARY: break; - case TABLEFILTER: + case TABLE_FILTER: break; - case TABLEUNION: + case TABLE_UNION: openTableUnionWizard(); break; - case TABLEGROUPBY: + case TABLE_GROUPBY: openGroupBy(); break; - case TABLETIMEAGGREGATE: + case TABLE_TIME_AGGREGATE: openTimeAggregate(); break; - case TABLEAGGREAGETE: + case TABLE_AGGREAGETE: break; - case TABLEREPLACEBYEXTERNALCOL: + case TABLE_REPLACE_BY_EXTERNAL_COL: openReplaceByExternalColWizard(); break; - case ROWADD: + case ROW_ADD: doRowAdd(); break; - case ROWDELETE: + case ROW_DELETE: doRowsDelete(); break; - case DUPLICATEDELETE: + case DUPLICATE_DELETE: openDuplicatesRows(); break; - case ANNOTATIONADD: + case GEOSPATIAL_CSQUARE: + openGeospatialCSquare(); break; - case COLUMNFILTER: + case GEOSPATIAL_OCEAN_AREA: + openGeospatialOceanArea(); + break; + case ANNOTATION_ADD: + break; + case COLUMN_FILTER: openMultiColumnFilter(); break; - case COLUMNBATCHREPLACE: + case COLUMN_BATCH_REPLACE: break; - case ANALYSETABLEFILTER: + case ANALYSE_TABLE_FILTER: break; - case ANALYSETABLEUNION: + case ANALYSE_TABLE_UNION: break; - case ANALYSETABLEGROUPBY: + case ANALYSE_TABLE_GROUPBY: break; - case ANALYSETABLEAGGREAGETE: + case ANALYSE_TABLE_AGGREAGETE: break; - case ANALYSEROWADD: + case ANALYSE_ROW_ADD: break; - case ANALYSEROWDELETE: + case ANALYSE_ROW_DELETE: break; - case ANALYSEDUPLICATEDELETE: + case ANALYSE_DUPLICATE_DELETE: break; - case ANALYSEANNOTATIONADD: + case ANALYSE_ANNOTATION_ADD: break; - case ANALYSECOLUMNFILTER: + case ANALYSE_COLUMN_FILTER: break; - case ANALYSECOLUMNEDIT: + case ANALYSE_COLUMN_EDIT: break; - case CHARTCREATE: + case CHART_CREATE: openCreateChart(); break; - case RSTUDIO: + case R_STUDIO: openRStudio(); break; case STATISTICAL: @@ -896,7 +905,7 @@ public class TabularDataController { break; case SPREAD: break; - case CREATEGISMAP: + case CREATE_GIS_MAP: openCreateMapWizard(); break; default: @@ -1930,7 +1939,47 @@ public class TabularDataController { UtilsGXT3.alert("Error", "No tabular resource present"); } } + + + private void openGeospatialCSquare() { + Log.debug("Request Geospatial Create C-Square Coordiantes Tab"); + if (trId != null) { + WidgetRequestEvent e = new WidgetRequestEvent( + WidgetRequestType.GEOSPATIALCREATECOORDINATESPANEL); + e.setTrId(trId); + HashMap map=new HashMap(); + map.put(RequestPropertiesParameterType.Coordinates, GeospatialCoordinatesType.C_SQUARE); + RequestProperties requestProperties= new RequestProperties(map); + e.setRequestProperties(requestProperties); + eventBus.fireEvent(e); + + } else { + Log.error("TRId is null"); + UtilsGXT3.alert("Error", "No tabular resource present"); + } + } + + private void openGeospatialOceanArea() { + Log.debug("Request Geospatial Create Ocean Area Coordiantes Tab"); + if (trId != null) { + WidgetRequestEvent e = new WidgetRequestEvent( + WidgetRequestType.GEOSPATIALCREATECOORDINATESPANEL); + e.setTrId(trId); + HashMap map=new HashMap(); + map.put(RequestPropertiesParameterType.Coordinates, GeospatialCoordinatesType.OCEAN_AREA); + RequestProperties requestProperties= new RequestProperties(map); + e.setRequestProperties(requestProperties); + eventBus.fireEvent(e); + + } else { + Log.error("TRId is null"); + UtilsGXT3.alert("Error", "No tabular resource present"); + } + } + + + private void openBackgroundMonitor() { Log.debug("Request Open Monitor Background Tab"); WidgetRequestEvent e = new WidgetRequestEvent( diff --git a/src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java b/src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java index 58c539f..decf928 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java +++ b/src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java @@ -415,4 +415,26 @@ public interface TabularDataResources extends ClientBundle { ImageResource replaceByExternalCol(); + @Source("flag-red_32.png") + ImageResource geospatialCSquare32(); + + @Source("flag-red.png") + ImageResource geospatialCSquare(); + + + @Source("flag-blue_32.png") + ImageResource geospatialOceanArea32(); + + @Source("flag-blue.png") + ImageResource geospatialOceanArea(); + + + @Source("flag-green_32.png") + ImageResource geospatialCoordinates32(); + + @Source("flag-green.png") + ImageResource geospatialCoordinates(); + + + } diff --git a/src/main/java/org/gcube/portlets/user/td/client/resource/flag-blue.png b/src/main/java/org/gcube/portlets/user/td/client/resource/flag-blue.png new file mode 100644 index 0000000..2b13ff4 Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/client/resource/flag-blue.png differ diff --git a/src/main/java/org/gcube/portlets/user/td/client/resource/flag-blue_32.png b/src/main/java/org/gcube/portlets/user/td/client/resource/flag-blue_32.png new file mode 100644 index 0000000..b0e7e97 Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/client/resource/flag-blue_32.png differ diff --git a/src/main/java/org/gcube/portlets/user/td/client/resource/flag-green.png b/src/main/java/org/gcube/portlets/user/td/client/resource/flag-green.png new file mode 100644 index 0000000..7cddd37 Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/client/resource/flag-green.png differ diff --git a/src/main/java/org/gcube/portlets/user/td/client/resource/flag-green_32.png b/src/main/java/org/gcube/portlets/user/td/client/resource/flag-green_32.png new file mode 100644 index 0000000..9b551e7 Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/client/resource/flag-green_32.png differ diff --git a/src/main/java/org/gcube/portlets/user/td/client/resource/flag-red.png b/src/main/java/org/gcube/portlets/user/td/client/resource/flag-red.png new file mode 100644 index 0000000..0037ed5 Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/client/resource/flag-red.png differ diff --git a/src/main/java/org/gcube/portlets/user/td/client/resource/flag-red_32.png b/src/main/java/org/gcube/portlets/user/td/client/resource/flag-red_32.png new file mode 100644 index 0000000..1ffe050 Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/client/resource/flag-red_32.png differ diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/AnalyseToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/AnalyseToolBar.java index 87c327b..fd6abc9 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/AnalyseToolBar.java +++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/AnalyseToolBar.java @@ -288,7 +288,7 @@ public class AnalyseToolBar { public void onSelect(SelectEvent event) { eventBus.fireEvent(new - RibbonEvent(RibbonType.CHARTCREATE)); + RibbonEvent(RibbonType.CHART_CREATE)); } }); @@ -354,7 +354,7 @@ public class AnalyseToolBar { rstudioButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.RSTUDIO)); + eventBus.fireEvent(new RibbonEvent(RibbonType.R_STUDIO)); } }); @@ -419,7 +419,7 @@ public class AnalyseToolBar { gisButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.CREATEGISMAP)); + eventBus.fireEvent(new RibbonEvent(RibbonType.CREATE_GIS_MAP)); } }); diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/CurationToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/CurationToolBar.java index 94f35d9..2d7fcda 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/CurationToolBar.java +++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/CurationToolBar.java @@ -127,7 +127,7 @@ public class CurationToolBar { public void onSelect(SelectEvent event) { eventBus.fireEvent(new RibbonEvent( - RibbonType.DUPLICATEDETECTION)); + RibbonType.DUPLICATE_DETECTION)); } }); @@ -144,7 +144,7 @@ public class CurationToolBar { applyTemplateButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.TEMPLATEAPPLY)); + eventBus.fireEvent(new RibbonEvent(RibbonType.TEMPLATE_APPLY)); } }); @@ -174,7 +174,7 @@ public class CurationToolBar { tableTypeButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.TABLETYPE)); + eventBus.fireEvent(new RibbonEvent(RibbonType.TABLE_TYPE)); } }); @@ -191,7 +191,7 @@ public class CurationToolBar { changeColumnLabelButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMNLABEL)); + eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMN_LABEL)); } }); @@ -208,7 +208,7 @@ public class CurationToolBar { columnTypeButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMNTYPE)); + eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMN_TYPE)); } }); @@ -225,7 +225,7 @@ public class CurationToolBar { addColumnButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMNADD)); + eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMN_ADD)); } }); @@ -242,7 +242,7 @@ public class CurationToolBar { deleteColumnButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMNDELETE)); + eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMN_DELETE)); } }); @@ -260,7 +260,7 @@ public class CurationToolBar { splitColumnButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMNSPLIT)); + eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMN_SPLIT)); } }); @@ -277,7 +277,7 @@ public class CurationToolBar { mergeColumnButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMNMERGE)); + eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMN_MERGE)); } }); @@ -342,7 +342,7 @@ public class CurationToolBar { extractCodelistButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.EXTRACTCODELIST)); + eventBus.fireEvent(new RibbonEvent(RibbonType.EXTRACT_CODELIST)); } }); @@ -359,7 +359,7 @@ public class CurationToolBar { codelistMappingButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.CODELISTMAPPING)); + eventBus.fireEvent(new RibbonEvent(RibbonType.CODELIST_MAPPING)); } }); diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java index 98d4201..837897b 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java +++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java @@ -206,7 +206,7 @@ public class FileToolBar { importSDMXButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORTSDMX)); + eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORT_SDMX)); } }); @@ -219,7 +219,7 @@ public class FileToolBar { importCSVButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORTCSV)); + eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORT_CSV)); } }); importLayout.setWidget(0, 2, importCSVButton); @@ -231,7 +231,7 @@ public class FileToolBar { importJSONButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORTJSON)); + eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORT_JSON)); } }); importLayout.setWidget(1, 2, importJSONButton); @@ -259,7 +259,7 @@ public class FileToolBar { exportSDMXButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.EXPORTSDMX)); + eventBus.fireEvent(new RibbonEvent(RibbonType.EXPORT_SDMX)); } }); @@ -273,7 +273,7 @@ public class FileToolBar { exportCSVButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.EXPORTCSV)); + eventBus.fireEvent(new RibbonEvent(RibbonType.EXPORT_CSV)); } }); exportLayout.setWidget(0, 2, exportCSVButton); @@ -285,7 +285,7 @@ public class FileToolBar { exportJSONButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.EXPORTJSON)); + eventBus.fireEvent(new RibbonEvent(RibbonType.EXPORT_JSON)); } }); exportLayout.setWidget(1, 2, exportJSONButton); @@ -313,7 +313,7 @@ public class FileToolBar { public void onSelect(SelectEvent event) { eventBus.fireEvent(new RibbonEvent( - RibbonType.TEMPLATENEW)); + RibbonType.TEMPLATE_NEW)); } }); @@ -331,7 +331,7 @@ public class FileToolBar { public void onSelect(SelectEvent event) { eventBus.fireEvent(new RibbonEvent( - RibbonType.TEMPLATEOPEN)); + RibbonType.TEMPLATE_OPEN)); } }); @@ -350,7 +350,7 @@ public class FileToolBar { public void onSelect(SelectEvent event) { eventBus.fireEvent(new RibbonEvent( - RibbonType.TEMPLATEDELETE)); + RibbonType.TEMPLATE_DELETE)); } }); @@ -426,7 +426,7 @@ public class FileToolBar { backgroundButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.BACKGROUNDTASKS)); + eventBus.fireEvent(new RibbonEvent(RibbonType.BACKGROUND_TASKS)); } }); diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java index f4e0585..024b9c7 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java +++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java @@ -48,8 +48,8 @@ public class ModifyToolBar { //protected TextButton annotationButton; // Column - protected TextButton filterColumnButton; - protected TextButton replaceValueBatchButton; + protected TextButton csquareButton; + protected TextButton oceanAreaButton; public ModifyToolBar(EventBus eventBus) { @@ -104,7 +104,7 @@ public class ModifyToolBar { unionButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.TABLEUNION)); + eventBus.fireEvent(new RibbonEvent(RibbonType.TABLE_UNION)); } }); @@ -122,7 +122,7 @@ public class ModifyToolBar { groupbyButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.TABLEGROUPBY)); + eventBus.fireEvent(new RibbonEvent(RibbonType.TABLE_GROUPBY)); } }); @@ -158,7 +158,7 @@ public class ModifyToolBar { timeAggregationButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.TABLETIMEAGGREGATE)); + eventBus.fireEvent(new RibbonEvent(RibbonType.TABLE_TIME_AGGREGATE)); } }); @@ -176,7 +176,7 @@ public class ModifyToolBar { replaceByExternalCol.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.TABLEREPLACEBYEXTERNALCOL)); + eventBus.fireEvent(new RibbonEvent(RibbonType.TABLE_REPLACE_BY_EXTERNAL_COL)); } }); @@ -196,7 +196,7 @@ public class ModifyToolBar { addRowButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.ROWADD)); + eventBus.fireEvent(new RibbonEvent(RibbonType.ROW_ADD)); } }); @@ -213,7 +213,7 @@ public class ModifyToolBar { deleteRowButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.ROWDELETE)); + eventBus.fireEvent(new RibbonEvent(RibbonType.ROW_DELETE)); } }); @@ -230,7 +230,7 @@ public class ModifyToolBar { deleteDuplicateButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.DUPLICATEDELETE)); + eventBus.fireEvent(new RibbonEvent(RibbonType.DUPLICATE_DELETE)); } }); @@ -257,61 +257,61 @@ public class ModifyToolBar { */ cleanCells(tableLayout.getElement()); - // Column Group - ButtonGroup columnGroup = new ButtonGroup(); - columnGroup.setId("Column"); - columnGroup.setStyleName("ribbon"); - columnGroup.setHeadingText("Column"); - columnGroup.disable(); - columnGroup.setVisible(false); - toolBar.add(columnGroup); + // Geospatial Group + ButtonGroup geospatialGroup = new ButtonGroup(); + geospatialGroup.setId("Geospatial"); + geospatialGroup.setStyleName("ribbon"); + geospatialGroup.setHeadingText("Geospatial"); + geospatialGroup.enable(); + geospatialGroup.setVisible(true); + toolBar.add(geospatialGroup); - FlexTable columnLayout = new FlexTable(); - columnGroup.add(columnLayout); + FlexTable geospatialLayout = new FlexTable(); + geospatialGroup.add(geospatialLayout); - filterColumnButton = new TextButton("Filter", - TabularDataResources.INSTANCE.columnFilter32()); - filterColumnButton.disable(); - filterColumnButton.setScale(ButtonScale.LARGE); - filterColumnButton.setIconAlign(IconAlign.TOP); - filterColumnButton - .setToolTip("Filter column values according to an condition"); - filterColumnButton + csquareButton = new TextButton("C-Square", + TabularDataResources.INSTANCE.geospatialCSquare32()); + csquareButton.disable(); + csquareButton.setScale(ButtonScale.LARGE); + csquareButton.setIconAlign(IconAlign.TOP); + csquareButton + .setToolTip("Create C-Square Coordinates"); + csquareButton .setArrowAlign(ButtonArrowAlign.BOTTOM); - filterColumnButton + csquareButton .addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMNFILTER)); + eventBus.fireEvent(new RibbonEvent(RibbonType.GEOSPATIAL_CSQUARE)); } }); - columnLayout.setWidget(0, 0, filterColumnButton); - columnLayout.getFlexCellFormatter().setRowSpan(0, 0, 2); + geospatialLayout.setWidget(0, 0, csquareButton); + geospatialLayout.getFlexCellFormatter().setRowSpan(0, 0, 2); - replaceValueBatchButton = new TextButton("Replace Batch", - TabularDataResources.INSTANCE.columnReplaceBatch32()); - replaceValueBatchButton.disable(); - replaceValueBatchButton.setScale(ButtonScale.LARGE); - replaceValueBatchButton.setIconAlign(IconAlign.TOP); - replaceValueBatchButton - .setToolTip("Replace column values in batch"); - replaceValueBatchButton + oceanAreaButton = new TextButton("Ocean Area", + TabularDataResources.INSTANCE.geospatialOceanArea32()); + oceanAreaButton.disable(); + oceanAreaButton.setScale(ButtonScale.LARGE); + oceanAreaButton.setIconAlign(IconAlign.TOP); + oceanAreaButton + .setToolTip("Create Ocean Area Coordinates"); + oceanAreaButton .setArrowAlign(ButtonArrowAlign.BOTTOM); - replaceValueBatchButton + oceanAreaButton .addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMNBATCHREPLACE)); + eventBus.fireEvent(new RibbonEvent(RibbonType.GEOSPATIAL_OCEAN_AREA)); } }); - columnLayout.setWidget(0, 1, replaceValueBatchButton); - columnLayout.getFlexCellFormatter().setRowSpan(0, 1, 2); + geospatialLayout.setWidget(0, 1, oceanAreaButton); + geospatialLayout.getFlexCellFormatter().setRowSpan(0, 1, 2); - cleanCells(columnLayout.getElement()); + cleanCells(geospatialLayout.getElement()); eventBus.addHandler(UIStateEvent.TYPE, new UIStateEvent.UIStateHandler() { @@ -352,9 +352,9 @@ public class ModifyToolBar { deleteRowButton.disable(); deleteDuplicateButton.disable(); //annotationButton.disable(); - // Column - filterColumnButton.disable(); - replaceValueBatchButton.disable(); + // geospatial + csquareButton.disable(); + oceanAreaButton.disable(); break; case TR_CLOSE: case TR_READONLY: @@ -369,9 +369,9 @@ public class ModifyToolBar { deleteRowButton.disable(); deleteDuplicateButton.disable(); //annotationButton.disable(); - // Column - filterColumnButton.disable(); - replaceValueBatchButton.disable(); + // geospatial + csquareButton.disable(); + oceanAreaButton.disable(); break; case TR_OPEN: case TABLEUPDATE: @@ -387,9 +387,9 @@ public class ModifyToolBar { deleteRowButton.enable(); deleteDuplicateButton.enable(); //annotationButton.disable(); - // Column - filterColumnButton.disable(); - replaceValueBatchButton.disable(); + // geospatial + csquareButton.enable(); + oceanAreaButton.enable(); break; case WIZARD_OPEN: // Table @@ -404,8 +404,8 @@ public class ModifyToolBar { deleteDuplicateButton.disable(); //annotationButton.disable(); // Column - filterColumnButton.disable(); - replaceValueBatchButton.disable(); + csquareButton.disable(); + oceanAreaButton.disable(); break; default: break; diff --git a/src/main/resources/org/gcube/portlets/user/td/client/resource/flag-blue.png b/src/main/resources/org/gcube/portlets/user/td/client/resource/flag-blue.png new file mode 100644 index 0000000..2b13ff4 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/user/td/client/resource/flag-blue.png differ diff --git a/src/main/resources/org/gcube/portlets/user/td/client/resource/flag-blue_32.png b/src/main/resources/org/gcube/portlets/user/td/client/resource/flag-blue_32.png new file mode 100644 index 0000000..b0e7e97 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/user/td/client/resource/flag-blue_32.png differ diff --git a/src/main/resources/org/gcube/portlets/user/td/client/resource/flag-green.png b/src/main/resources/org/gcube/portlets/user/td/client/resource/flag-green.png new file mode 100644 index 0000000..7cddd37 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/user/td/client/resource/flag-green.png differ diff --git a/src/main/resources/org/gcube/portlets/user/td/client/resource/flag-green_32.png b/src/main/resources/org/gcube/portlets/user/td/client/resource/flag-green_32.png new file mode 100644 index 0000000..9b551e7 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/user/td/client/resource/flag-green_32.png differ diff --git a/src/main/resources/org/gcube/portlets/user/td/client/resource/flag-red.png b/src/main/resources/org/gcube/portlets/user/td/client/resource/flag-red.png new file mode 100644 index 0000000..0037ed5 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/user/td/client/resource/flag-red.png differ diff --git a/src/main/resources/org/gcube/portlets/user/td/client/resource/flag-red_32.png b/src/main/resources/org/gcube/portlets/user/td/client/resource/flag-red_32.png new file mode 100644 index 0000000..1ffe050 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/user/td/client/resource/flag-red_32.png differ diff --git a/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml index 68a867e..b789ef2 100644 --- a/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml @@ -76,7 +76,7 @@ -