Minor Update
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-widget-common-event@111803 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
64a38b61b4
commit
da8d093e2c
|
@ -32,6 +32,7 @@ public enum ChangeTableRequestType {
|
||||||
ROLLBACK,
|
ROLLBACK,
|
||||||
EDITROW,
|
EDITROW,
|
||||||
SHARE,
|
SHARE,
|
||||||
|
GEOSPATIALCREATECOORDINATES,
|
||||||
TASKRESUME,
|
TASKRESUME,
|
||||||
TASKRESUBMIT,
|
TASKRESUBMIT,
|
||||||
STATISTICALOPERATION;
|
STATISTICALOPERATION;
|
||||||
|
|
|
@ -15,65 +15,67 @@ public enum RibbonType {
|
||||||
CLOSE,
|
CLOSE,
|
||||||
DELETE,
|
DELETE,
|
||||||
PROPERTIES,
|
PROPERTIES,
|
||||||
IMPORTSDMX,
|
IMPORT_SDMX,
|
||||||
IMPORTCSV,
|
IMPORT_CSV,
|
||||||
IMPORTJSON,
|
IMPORT_JSON,
|
||||||
EXPORTSDMX,
|
EXPORT_SDMX,
|
||||||
EXPORTCSV,
|
EXPORT_CSV,
|
||||||
EXPORTJSON,
|
EXPORT_JSON,
|
||||||
TEMPLATEOPEN,
|
TEMPLATE_OPEN,
|
||||||
TEMPLATENEW,
|
TEMPLATE_NEW,
|
||||||
TEMPLATEDELETE,
|
TEMPLATE_DELETE,
|
||||||
SHARE,
|
SHARE,
|
||||||
TIMELINE,
|
TIMELINE,
|
||||||
BACKGROUNDTASKS,
|
BACKGROUND_TASKS,
|
||||||
HISTORY,
|
HISTORY,
|
||||||
UNDO,
|
UNDO,
|
||||||
DISCARDALL,
|
DISCARD_ALL,
|
||||||
LOGS,
|
LOGS,
|
||||||
HELP,
|
HELP,
|
||||||
RULENEW,
|
RULE_NEW,
|
||||||
RULEMANAGE,
|
RULE_MANAGE,
|
||||||
DUPLICATEDETECTION,
|
DUPLICATE_DETECTION,
|
||||||
TEMPLATEAPPLY,
|
TEMPLATE_APPLY,
|
||||||
TABLETYPE,
|
TABLE_TYPE,
|
||||||
COLUMNLABEL,
|
COLUMN_LABEL,
|
||||||
COLUMNTYPE,
|
COLUMN_TYPE,
|
||||||
COLUMNADD,
|
COLUMN_ADD,
|
||||||
COLUMNDELETE,
|
COLUMN_DELETE,
|
||||||
COLUMNSPLIT,
|
COLUMN_SPLIT,
|
||||||
COLUMNMERGE,
|
COLUMN_MERGE,
|
||||||
DENORMALIZE,
|
DENORMALIZE,
|
||||||
NORMALIZE,
|
NORMALIZE,
|
||||||
EXTRACTCODELIST,
|
EXTRACT_CODELIST,
|
||||||
CODELISTMAPPING,
|
CODELIST_MAPPING,
|
||||||
GENERATESUMMARY,
|
GENERATE_SUMMARY,
|
||||||
TABLEFILTER,
|
TABLE_FILTER,
|
||||||
TABLEUNION,
|
TABLE_UNION,
|
||||||
TABLEGROUPBY,
|
TABLE_GROUPBY,
|
||||||
TABLETIMEAGGREGATE,
|
TABLE_TIME_AGGREGATE,
|
||||||
TABLEREPLACEBYEXTERNALCOL,
|
TABLE_REPLACE_BY_EXTERNAL_COL,
|
||||||
TABLEAGGREAGETE,
|
TABLE_AGGREAGETE,
|
||||||
ROWADD,
|
ROW_ADD,
|
||||||
ROWDELETE,
|
ROW_DELETE,
|
||||||
DUPLICATEDELETE,
|
DUPLICATE_DELETE,
|
||||||
ANNOTATIONADD,
|
GEOSPATIAL_CSQUARE,
|
||||||
COLUMNFILTER,
|
GEOSPATIAL_OCEAN_AREA,
|
||||||
COLUMNBATCHREPLACE,
|
ANNOTATION_ADD,
|
||||||
ANALYSETABLEFILTER,
|
COLUMN_FILTER,
|
||||||
ANALYSETABLEUNION,
|
COLUMN_BATCH_REPLACE,
|
||||||
ANALYSETABLEGROUPBY,
|
ANALYSE_TABLE_FILTER,
|
||||||
ANALYSETABLEAGGREAGETE,
|
ANALYSE_TABLE_UNION,
|
||||||
ANALYSEROWADD,
|
ANALYSE_TABLE_GROUPBY,
|
||||||
ANALYSEROWDELETE,
|
ANALYSE_TABLE_AGGREAGETE,
|
||||||
ANALYSEDUPLICATEDELETE,
|
ANALYSE_ROW_ADD,
|
||||||
ANALYSEANNOTATIONADD,
|
ANALYSE_ROW_DELETE,
|
||||||
ANALYSECOLUMNFILTER,
|
ANALYSE_DUPLICATE_DELETE,
|
||||||
ANALYSECOLUMNEDIT,
|
ANALYSE_ANNOTATION_ADD,
|
||||||
CHARTCREATE,
|
ANALYSE_COLUMN_FILTER,
|
||||||
RSTUDIO,
|
ANALYSE_COLUMN_EDIT,
|
||||||
|
CHART_CREATE,
|
||||||
|
R_STUDIO,
|
||||||
STATISTICAL,
|
STATISTICAL,
|
||||||
SPREAD,
|
SPREAD,
|
||||||
CREATEGISMAP;
|
CREATE_GIS_MAP;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,6 +25,7 @@ public enum WidgetRequestType {
|
||||||
VALIDATIONSTASKSPANEL,
|
VALIDATIONSTASKSPANEL,
|
||||||
CURATIONBYREPLACEBATCHDIALOG,
|
CURATIONBYREPLACEBATCHDIALOG,
|
||||||
MONITORBACKGROUNDPANEL,
|
MONITORBACKGROUNDPANEL,
|
||||||
RESOURCESPANEL;
|
RESOURCESPANEL,
|
||||||
|
GEOSPATIALCREATECOORDINATESPANEL;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,22 +12,22 @@ public class RequestProperties implements Serializable {
|
||||||
|
|
||||||
private static final long serialVersionUID = -3084969072634114974L;
|
private static final long serialVersionUID = -3084969072634114974L;
|
||||||
|
|
||||||
HashMap<String, Object> map;
|
HashMap<RequestPropertiesParameterType, Object> map;
|
||||||
|
|
||||||
public RequestProperties(){
|
public RequestProperties(){
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public RequestProperties(HashMap<String,Object> map){
|
public RequestProperties(HashMap<RequestPropertiesParameterType,Object> map){
|
||||||
this.map=map;
|
this.map=map;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public HashMap<String, Object> getMap() {
|
public HashMap<RequestPropertiesParameterType, Object> getMap() {
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setMap(HashMap<String, Object> map) {
|
public void setMap(HashMap<RequestPropertiesParameterType, Object> map) {
|
||||||
this.map = map;
|
this.map = map;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,32 @@
|
||||||
|
package org.gcube.portlets.user.td.widgetcommonevent.shared;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @author giancarlo
|
||||||
|
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public enum RequestPropertiesParameterType {
|
||||||
|
Coordinates("Coordinates"),
|
||||||
|
InvocationS ("InvocationS"),
|
||||||
|
RefColumn("RefColumn"),
|
||||||
|
ColumnId("ColumnId"),
|
||||||
|
TaskId("TaskId"),
|
||||||
|
ConditionCode("ConditionCode"),
|
||||||
|
ValidationColumnColumnId("ValidationColumnColumnId");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param text
|
||||||
|
*/
|
||||||
|
private RequestPropertiesParameterType(final String id) {
|
||||||
|
this.id = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
private final String id;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -1,5 +1,8 @@
|
||||||
package org.gcube.portlets.user.td.widgetcommonevent.shared.geospatial;
|
package org.gcube.portlets.user.td.widgetcommonevent.shared.geospatial;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author "Giancarlo Panichi" <a
|
* @author "Giancarlo Panichi" <a
|
||||||
|
@ -7,8 +10,8 @@ package org.gcube.portlets.user.td.widgetcommonevent.shared.geospatial;
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public enum GeospatialCoordinatesType {
|
public enum GeospatialCoordinatesType {
|
||||||
C_SQUARE("C-Square"), OCEAN_AREA("Ocean Area");
|
C_SQUARE("CSQUARECODE"), OCEAN_AREA("OCEANAREA");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param text
|
* @param text
|
||||||
*/
|
*/
|
||||||
|
@ -22,6 +25,12 @@ public enum GeospatialCoordinatesType {
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static List<GeospatialCoordinatesType> getList(){
|
||||||
|
return Arrays.asList(values());
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public static GeospatialCoordinatesType getGeospatialCoordinatesTypeFromId(
|
public static GeospatialCoordinatesType getGeospatialCoordinatesTypeFromId(
|
||||||
String id) {
|
String id) {
|
||||||
|
@ -36,5 +45,19 @@ public enum GeospatialCoordinatesType {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getLabel(){
|
||||||
|
switch(this){
|
||||||
|
case C_SQUARE:
|
||||||
|
return "C-Square";
|
||||||
|
|
||||||
|
case OCEAN_AREA:
|
||||||
|
return "Ocean Area";
|
||||||
|
default:
|
||||||
|
return null;
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -123,10 +123,13 @@ public enum OperationsId {
|
||||||
StatisticalOperation("10001"),
|
StatisticalOperation("10001"),
|
||||||
ExportToStatisticalOperation("10002"),
|
ExportToStatisticalOperation("10002"),
|
||||||
ImportFromStatistical("10003"),
|
ImportFromStatistical("10003"),
|
||||||
|
CoordinatesEnhancement("10101"),
|
||||||
ExtractCodelist("11001"),
|
ExtractCodelist("11001"),
|
||||||
GuessCodelist("11002"),
|
GuessCodelist("11002"),
|
||||||
CodelistMappingImport("12001");
|
CodelistMappingImport("12001");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param text
|
* @param text
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -49,6 +49,7 @@ public enum UIOperationsId {
|
||||||
GenerateMap("Generate Map"),
|
GenerateMap("Generate Map"),
|
||||||
StatisticalOperation("Statistical Operation"),
|
StatisticalOperation("Statistical Operation"),
|
||||||
ChartTopRating("Top Rating Chart"),
|
ChartTopRating("Top Rating Chart"),
|
||||||
|
GeospatialCreateCoordinates("Geospatial Create Coordinates"),
|
||||||
Pending("Pending");
|
Pending("Pending");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -43,9 +43,9 @@ public class GwtTestWidgetCommonEvent extends GWTTestCase {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORTSDMX));
|
eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORT_SDMX));
|
||||||
eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORTCSV));
|
eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORT_CSV));
|
||||||
eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORTJSON));
|
eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORT_JSON));
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -54,13 +54,13 @@ public class GwtTestWidgetCommonEvent extends GWTTestCase {
|
||||||
System.out.println("doRibbonCommand Type: " + event.getRibbonType());
|
System.out.println("doRibbonCommand Type: " + event.getRibbonType());
|
||||||
try {
|
try {
|
||||||
switch (event.getRibbonType()) {
|
switch (event.getRibbonType()) {
|
||||||
case IMPORTSDMX:
|
case IMPORT_SDMX:
|
||||||
System.out.println("Start Import SDMX");
|
System.out.println("Start Import SDMX");
|
||||||
break;
|
break;
|
||||||
case IMPORTCSV:
|
case IMPORT_CSV:
|
||||||
System.out.println("Start Import CSV");
|
System.out.println("Start Import CSV");
|
||||||
break;
|
break;
|
||||||
case IMPORTJSON:
|
case IMPORT_JSON:
|
||||||
System.out.println("Start Import JSON");
|
System.out.println("Start Import JSON");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in New Issue