Minor Update

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@90809 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java

@@ -130,7 +130,23 @@ public interface TabularDataResources extends ClientBundle {
 	
 	
 	@Source("table-denormalize_32.png")
-	ImageResource denormalize32();
+	ImageResource tableDenormalize32();
+	
+	@Source("table-denormalize.png")
+	ImageResource tableDenormalize();
+	
+	@Source("table-normalize_32.png")
+	ImageResource tableNormalize32();
+	
+	@Source("table-normalize.png")
+	ImageResource tableNormalize();
+	
+	@Source("table-expand_32.png")
+	ImageResource tableExpand32();
+	
+	@Source("table-expand.png")
+	ImageResource tableExpand();
+	
 	
 	@Source("table-group_32.png")
 	ImageResource group32();
@@ -291,4 +307,35 @@ public interface TabularDataResources extends ClientBundle {
 	@Source("table-duplicate-rows-remove.png")
 	ImageResource tableDuplicateRowsRemove();
 	
+	@Source("table-type_32.png")
+	ImageResource tableType32();
+	
+	@Source("table-type.png")
+	ImageResource tableType();
+	
+	@Source("codelist_32.png")
+	ImageResource codelist32();
+	
+	@Source("codelist.png")
+	ImageResource codelist();
+	
+	@Source("summary_32.png")
+	ImageResource summary32();
+	
+	@Source("summary.png")
+	ImageResource summary();
+	
+	@Source("tag-blue-add_32.png")
+	ImageResource annotationAdd32();
+	
+	@Source("tag-blue-add.png")
+	ImageResource annotationAdd();
+	
+	@Source("tag-blue-delete_32.png")
+	ImageResource annotationDelete32();
+	
+	@Source("tag-blue-delte.png")
+	ImageResource annotationDelete();
+	
+	
 }

src/main/java/org/gcube/portlets/user/td/client/ribbon/AnalyseToolBar.java

@@ -21,42 +21,246 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
 
 /**
  * @author "Federico De Faveri defaveri@isti.cnr.it"
- *
+ * 
  */
 public class AnalyseToolBar {
 
 	protected EventBus eventBus;
 	protected ToolBar toolBar;
-	
+
 	protected TextButton pieButton;
 	protected TextButton barButton;
 	protected TextButton curveButton;
 	protected TextButton bullsButton;
 	protected TextButton statisticalButton;
 	protected TextButton rstudioButton;
-	
+
 	protected TextButton gisButton;
-	
+	protected TextButton spreadButton;
-	
+	protected TextButton filterButton;
-	
+	protected TextButton unionButton;
-	public AnalyseToolBar(EventBus eventBus)
+	protected TextButton groupbyButton;
-	{
+	protected TextButton aggregateButton;
+	protected TextButton addRowButton;
+	protected TextButton deleteRowButton;
+	protected TextButton deleteDuplicateButton;
+	protected TextButton annotationButton;
+	protected TextButton filterColumnButton;
+	protected TextButton editColumnValueOnConditionButton;
+
+	public AnalyseToolBar(EventBus eventBus) {
 		this.eventBus = eventBus;
 		build();
 	}
-	
+
-	public ToolBar getToolBar()
+	public ToolBar getToolBar() {
-	{
 		return toolBar;
 	}
 
-	protected void build()
+	protected void build() {
-	{
 		toolBar = new ToolBar();
 		toolBar.setSpacing(1);
 		toolBar.setEnableOverflow(false);
-		
+
-		//Charts Group
+		// Table Group
+		ButtonGroup tableGroup = new ButtonGroup();
+		tableGroup.setId("Table");
+		tableGroup.setStyleName("ribbon");
+		tableGroup.setHeadingText("Table");
+		tableGroup.disable();
+		toolBar.add(tableGroup);
+
+		FlexTable tableLayout = new FlexTable();
+		tableGroup.add(tableLayout);
+
+		filterButton = new TextButton("Filter",
+				TabularDataResources.INSTANCE.filter32());
+		filterButton.setScale(ButtonScale.LARGE);
+		filterButton.setIconAlign(IconAlign.TOP);
+		filterButton.setToolTip("Filter table data");
+		filterButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
+		filterButton.addSelectHandler(new SelectHandler() {
+
+			public void onSelect(SelectEvent event) {
+				// eventBus.fireEvent(new
+				// ImportTableEvent(ImportTableType.JSON));
+			}
+		});
+
+		tableLayout.setWidget(0, 0, filterButton);
+		tableLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
+
+		unionButton = new TextButton("Union",
+				TabularDataResources.INSTANCE.union32());
+		unionButton.setScale(ButtonScale.LARGE);
+		unionButton.setIconAlign(IconAlign.TOP);
+		unionButton.setToolTip("Merge tables data");
+		unionButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
+		unionButton.addSelectHandler(new SelectHandler() {
+
+			public void onSelect(SelectEvent event) {
+				// eventBus.fireEvent(new
+				// ImportTableEvent(ImportTableType.JSON));
+			}
+		});
+
+		tableLayout.setWidget(0, 1, unionButton);
+		tableLayout.getFlexCellFormatter().setRowSpan(0, 1, 2);
+
+		groupbyButton = new TextButton("Group By",
+				TabularDataResources.INSTANCE.group32());
+		groupbyButton.setScale(ButtonScale.LARGE);
+		groupbyButton.setIconAlign(IconAlign.TOP);
+		groupbyButton.setToolTip("Perform data grouping");
+		groupbyButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
+		groupbyButton.addSelectHandler(new SelectHandler() {
+
+			public void onSelect(SelectEvent event) {
+				// eventBus.fireEvent(new
+				// ImportTableEvent(ImportTableType.JSON));
+			}
+		});
+
+		tableLayout.setWidget(0, 2, groupbyButton);
+		tableLayout.getFlexCellFormatter().setRowSpan(0, 2, 2);
+
+		aggregateButton = new TextButton("Aggregate",
+				TabularDataResources.INSTANCE.aggregate32());
+		aggregateButton.setScale(ButtonScale.LARGE);
+		aggregateButton.setIconAlign(IconAlign.TOP);
+		aggregateButton.setToolTip("Performs data aggregation");
+		aggregateButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
+		aggregateButton.addSelectHandler(new SelectHandler() {
+
+			public void onSelect(SelectEvent event) {
+				// eventBus.fireEvent(new
+				// ImportTableEvent(ImportTableType.JSON));
+			}
+		});
+
+		tableLayout.setWidget(0, 3, aggregateButton);
+		tableLayout.getFlexCellFormatter().setRowSpan(0, 3, 2);
+
+		addRowButton = new TextButton("Add Row",
+				TabularDataResources.INSTANCE.rowInsert32());
+		addRowButton.setScale(ButtonScale.LARGE);
+		addRowButton.setIconAlign(IconAlign.TOP);
+		addRowButton.setToolTip("Add row");
+		addRowButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
+		addRowButton.addSelectHandler(new SelectHandler() {
+
+			public void onSelect(SelectEvent event) {
+				// eventBus.fireEvent(new
+				// ImportTableEvent(ImportTableType.JSON));
+			}
+		});
+
+		tableLayout.setWidget(0, 4, addRowButton);
+		tableLayout.getFlexCellFormatter().setRowSpan(0, 4, 2);
+
+		deleteRowButton = new TextButton("Delete Row",
+				TabularDataResources.INSTANCE.rowRemove32());
+		deleteRowButton.setScale(ButtonScale.LARGE);
+		deleteRowButton.setIconAlign(IconAlign.TOP);
+		deleteRowButton.setToolTip("Delete row");
+		deleteRowButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
+		deleteRowButton.addSelectHandler(new SelectHandler() {
+
+			public void onSelect(SelectEvent event) {
+				// eventBus.fireEvent(new
+				// ImportTableEvent(ImportTableType.JSON));
+			}
+		});
+
+		tableLayout.setWidget(0, 5, deleteRowButton);
+		tableLayout.getFlexCellFormatter().setRowSpan(0, 5, 2);
+
+		deleteDuplicateButton = new TextButton("Delete Duplicate",
+				TabularDataResources.INSTANCE.tableDuplicateRowsRemove32());
+		deleteDuplicateButton.setScale(ButtonScale.LARGE);
+		deleteDuplicateButton.setIconAlign(IconAlign.TOP);
+		deleteDuplicateButton.setToolTip("Delete duplicate row");
+		deleteDuplicateButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
+		deleteDuplicateButton.addSelectHandler(new SelectHandler() {
+
+			public void onSelect(SelectEvent event) {
+				// eventBus.fireEvent(new
+				// ImportTableEvent(ImportTableType.JSON));
+			}
+		});
+
+		tableLayout.setWidget(0, 6, deleteDuplicateButton);
+		tableLayout.getFlexCellFormatter().setRowSpan(0, 6, 2);
+
+		annotationButton = new TextButton("Annotation",
+				TabularDataResources.INSTANCE.annotationAdd32());
+		annotationButton.setScale(ButtonScale.LARGE);
+		annotationButton.setIconAlign(IconAlign.TOP);
+		annotationButton.setToolTip("Add annotation column");
+		annotationButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
+		annotationButton.addSelectHandler(new SelectHandler() {
+
+			public void onSelect(SelectEvent event) {
+				// eventBus.fireEvent(new
+				// ImportTableEvent(ImportTableType.JSON));
+			}
+		});
+
+		tableLayout.setWidget(0, 7, annotationButton);
+		tableLayout.getFlexCellFormatter().setRowSpan(0, 7, 2);
+
+		cleanCells(tableLayout.getElement());
+
+		// Column Group
+		ButtonGroup columnGroup = new ButtonGroup();
+		columnGroup.setId("Column");
+		columnGroup.setStyleName("ribbon");
+		columnGroup.setHeadingText("Column");
+		columnGroup.disable();
+		toolBar.add(columnGroup);
+
+		FlexTable columnLayout = new FlexTable();
+		columnGroup.add(columnLayout);
+
+		filterColumnButton = new TextButton("Filter",
+				TabularDataResources.INSTANCE.columnFilter32());
+		filterColumnButton.setScale(ButtonScale.LARGE);
+		filterColumnButton.setIconAlign(IconAlign.TOP);
+		filterColumnButton
+				.setToolTip("Filter column values according to an condition");
+		filterColumnButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
+		filterColumnButton.addSelectHandler(new SelectHandler() {
+
+			public void onSelect(SelectEvent event) {
+				// eventBus.fireEvent(new
+				// ImportTableEvent(ImportTableType.JSON));
+			}
+		});
+
+		columnLayout.setWidget(0, 0, filterColumnButton);
+		columnLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
+
+		editColumnValueOnConditionButton = new TextButton("Edit",
+				TabularDataResources.INSTANCE.columnValues32());
+		editColumnValueOnConditionButton.setScale(ButtonScale.LARGE);
+		editColumnValueOnConditionButton.setIconAlign(IconAlign.TOP);
+		editColumnValueOnConditionButton
+				.setToolTip("Edit column values according to an condition");
+		editColumnValueOnConditionButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
+		editColumnValueOnConditionButton.addSelectHandler(new SelectHandler() {
+
+			public void onSelect(SelectEvent event) {
+				// eventBus.fireEvent(new
+				// ImportTableEvent(ImportTableType.JSON));
+			}
+		});
+
+		columnLayout.setWidget(0, 1, editColumnValueOnConditionButton);
+		columnLayout.getFlexCellFormatter().setRowSpan(0, 1, 2);
+
+		cleanCells(columnLayout.getElement());
+
+		// Charts Group
 		ButtonGroup chartsGroup = new ButtonGroup();
 		chartsGroup.setId("Charts");
 		chartsGroup.setStyleName("ribbon");
@@ -67,102 +271,87 @@ public class AnalyseToolBar {
 		FlexTable basicLayout = new FlexTable();
 		chartsGroup.add(basicLayout);
 
-		pieButton = new TextButton("Pie", TabularDataResources.INSTANCE.chartPie32());
+		pieButton = new TextButton("Pie",
+				TabularDataResources.INSTANCE.chartPie32());
 		pieButton.setScale(ButtonScale.LARGE);
 		pieButton.setIconAlign(IconAlign.TOP);
 		pieButton.setToolTip("Pie");
 		pieButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
 		pieButton.addSelectHandler(new SelectHandler() {
-			
+
-			
 			public void onSelect(SelectEvent event) {
-				//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
+				// eventBus.fireEvent(new
+				// ImportTableEvent(ImportTableType.JSON));
 			}
 		});
 
 		basicLayout.setWidget(0, 0, pieButton);
 		basicLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
-		
 
-		barButton = new TextButton("Bar", TabularDataResources.INSTANCE.chartBar32());
+		barButton = new TextButton("Bar",
+				TabularDataResources.INSTANCE.chartBar32());
 		barButton.setScale(ButtonScale.LARGE);
 		barButton.setIconAlign(IconAlign.TOP);
 		barButton.setToolTip("Bar");
 		barButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
 		barButton.addSelectHandler(new SelectHandler() {
-			
+
 			public void onSelect(SelectEvent event) {
-				//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
+				// eventBus.fireEvent(new
+				// ImportTableEvent(ImportTableType.JSON));
 			}
 		});
 
 		basicLayout.setWidget(0, 1, barButton);
 		basicLayout.getFlexCellFormatter().setRowSpan(0, 1, 2);
 
-		
+		curveButton = new TextButton("Curve",
-		curveButton = new TextButton("Curve", TabularDataResources.INSTANCE.chartCurve32());
+				TabularDataResources.INSTANCE.chartCurve32());
 		curveButton.setScale(ButtonScale.LARGE);
 		curveButton.setIconAlign(IconAlign.TOP);
 		curveButton.setToolTip("Curve");
 		curveButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
 		curveButton.addSelectHandler(new SelectHandler() {
-			
+
 			public void onSelect(SelectEvent event) {
-				//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
+				// eventBus.fireEvent(new
+				// ImportTableEvent(ImportTableType.JSON));
 			}
 		});
 
 		basicLayout.setWidget(0, 2, curveButton);
 		basicLayout.getFlexCellFormatter().setRowSpan(0, 2, 2);
 
-		bullsButton = new TextButton("Bulls", TabularDataResources.INSTANCE.chartBulls32());
+		bullsButton = new TextButton("Bulls",
+				TabularDataResources.INSTANCE.chartBulls32());
 		bullsButton.setScale(ButtonScale.LARGE);
 		bullsButton.setIconAlign(IconAlign.TOP);
 		bullsButton.setToolTip("Bulls");
 		bullsButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
 		bullsButton.addSelectHandler(new SelectHandler() {
-			
+
 			public void onSelect(SelectEvent event) {
-				//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
+				// eventBus.fireEvent(new
+				// ImportTableEvent(ImportTableType.JSON));
 			}
 		});
 
 		basicLayout.setWidget(0, 3, bullsButton);
 		basicLayout.getFlexCellFormatter().setRowSpan(0, 3, 2);
-		
+
-		
 		cleanCells(basicLayout.getElement());
-		
-		
-		//External Tools 
-		ButtonGroup externalToolGroup = new ButtonGroup();
-		externalToolGroup.setId("ExternalTools");
-		externalToolGroup.setStyleName("ribbon");
-		externalToolGroup.setHeadingText("External Tools");
-		externalToolGroup.disable();
-		toolBar.add(externalToolGroup);
 
-		FlexTable externalToolLayout = new FlexTable();
+		// Process
-		externalToolGroup.add(externalToolLayout);
+		ButtonGroup processGroup = new ButtonGroup();
+		processGroup.setId("Process");
+		processGroup.setStyleName("ribbon");
+		processGroup.setHeadingText("Process");
+		processGroup.disable();
+		toolBar.add(processGroup);
 
-		gisButton = new TextButton("GIS", TabularDataResources.INSTANCE.gis32());
+		FlexTable processLayout = new FlexTable();
-		gisButton.setScale(ButtonScale.LARGE);
+		processGroup.add(processLayout);
-		gisButton.setIconAlign(IconAlign.TOP);
-		gisButton.setToolTip("GIS");
-		gisButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
-		gisButton.addSelectHandler(new SelectHandler() {
-			
-			
-			public void onSelect(SelectEvent event) {
-				//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
-			}
-		});
 
-		externalToolLayout.setWidget(0, 0, gisButton);
-		externalToolLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
-		
-		
-		
 		rstudioButton = new TextButton("R Studio",
 				TabularDataResources.INSTANCE.rstudio32());
 		rstudioButton.setScale(ButtonScale.LARGE);
@@ -177,8 +366,8 @@ public class AnalyseToolBar {
 			}
 		});
 
-		externalToolLayout.setWidget(0, 1, rstudioButton);
+		processLayout.setWidget(0, 0, rstudioButton);
-		externalToolLayout.getFlexCellFormatter().setRowSpan(0, 1, 2);
+		processLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
 
 		statisticalButton = new TextButton("Statistical",
 				TabularDataResources.INSTANCE.statistical32());
@@ -194,12 +383,56 @@ public class AnalyseToolBar {
 			}
 		});
 
-		externalToolLayout.setWidget(0, 2, statisticalButton);
+		processLayout.setWidget(0, 1, statisticalButton);
-		externalToolLayout.getFlexCellFormatter().setRowSpan(0, 2, 2);
+		processLayout.getFlexCellFormatter().setRowSpan(0, 1, 2);
 
-		cleanCells(externalToolLayout.getElement());
+		spreadButton = new TextButton("SPREAD",
+				TabularDataResources.INSTANCE.cog32());
+		spreadButton.setScale(ButtonScale.LARGE);
+		spreadButton.setIconAlign(IconAlign.TOP);
+		spreadButton.setToolTip("SPREAD");
+		spreadButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
+		spreadButton.addSelectHandler(new SelectHandler() {
+
+			public void onSelect(SelectEvent event) {
+				// eventBus.fireEvent(new
+				// ImportTableEvent(ImportTableType.JSON));
+			}
+		});
+
+		processLayout.setWidget(0, 2, spreadButton);
+		processLayout.getFlexCellFormatter().setRowSpan(0, 2, 2);
+
+		cleanCells(processLayout.getElement());
+
+		// Project
+		ButtonGroup projectGroup = new ButtonGroup();
+		projectGroup.setId("Project");
+		projectGroup.setStyleName("ribbon");
+		projectGroup.setHeadingText("Project");
+		projectGroup.disable();
+		toolBar.add(projectGroup);
+
+		FlexTable projectLayout = new FlexTable();
+		projectGroup.add(projectLayout);
+
+		gisButton = new TextButton("GIS", TabularDataResources.INSTANCE.gis32());
+		gisButton.setScale(ButtonScale.LARGE);
+		gisButton.setIconAlign(IconAlign.TOP);
+		gisButton.setToolTip("GIS");
+		gisButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
+		gisButton.addSelectHandler(new SelectHandler() {
+
+			public void onSelect(SelectEvent event) {
+				// eventBus.fireEvent(new
+				// ImportTableEvent(ImportTableType.JSON));
+			}
+		});
+
+		projectLayout.setWidget(0, 0, gisButton);
+		projectLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
+		cleanCells(projectLayout.getElement());
 
-		
 	}
 
 	protected void cleanCells(Element elem) {

src/main/java/org/gcube/portlets/user/td/client/ribbon/CurationToolBar.java

@@ -154,7 +154,7 @@ public class CurationToolBar {
 		structureGroup.add(structureLayout);
 
 		tableTypeButton = new TextButton("Table Type",
-				TabularDataResources.INSTANCE.cog32());
+				TabularDataResources.INSTANCE.tableType32());
 		tableTypeButton.setScale(ButtonScale.LARGE);
 		tableTypeButton.setIconAlign(IconAlign.TOP);
 		tableTypeButton.setToolTip("Change table type");
@@ -239,7 +239,7 @@ public class CurationToolBar {
 		structureLayout.getFlexCellFormatter().setRowSpan(0, 4, 2);
 
 		denormalizeButton = new TextButton("Denormalize",
-				TabularDataResources.INSTANCE.denormalize32());
+				TabularDataResources.INSTANCE.tableDenormalize32());
 		denormalizeButton.setScale(ButtonScale.LARGE);
 		denormalizeButton.setIconAlign(IconAlign.TOP);
 		denormalizeButton.setToolTip("Denormalize table");
@@ -256,7 +256,7 @@ public class CurationToolBar {
 		structureLayout.getFlexCellFormatter().setRowSpan(0, 5, 2);
 
 		normalizeButton = new TextButton("Normalize",
-				TabularDataResources.INSTANCE.cog32());
+				TabularDataResources.INSTANCE.tableNormalize32());
 		normalizeButton.setScale(ButtonScale.LARGE);
 		normalizeButton.setIconAlign(IconAlign.TOP);
 		normalizeButton.setToolTip("Normalize");
@@ -285,7 +285,7 @@ public class CurationToolBar {
 		helperGroup.add(helperLayout);
 
 		extractCodelistButton = new TextButton("Extract Codelist",
-				TabularDataResources.INSTANCE.cog32());
+				TabularDataResources.INSTANCE.codelist32());
 		extractCodelistButton.setScale(ButtonScale.LARGE);
 		extractCodelistButton.setIconAlign(IconAlign.TOP);
 		extractCodelistButton.setToolTip("Extract Codelist");
@@ -302,7 +302,7 @@ public class CurationToolBar {
 		helperLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
 		
 		generateSummaryButton = new TextButton("Generate Summary",
-				TabularDataResources.INSTANCE.cog32());
+				TabularDataResources.INSTANCE.summary32());
 		generateSummaryButton.setScale(ButtonScale.LARGE);
 		generateSummaryButton.setIconAlign(IconAlign.TOP);
 		generateSummaryButton.setToolTip("Generate Summary");

src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java

@@ -46,7 +46,7 @@ public class ModifyToolBar {
 	protected TextButton addRowButton;
 	protected TextButton deleteRowButton;
 	protected TextButton annotationButton;
-	private TextButton deleteDuplicateButton;
+	protected TextButton deleteDuplicateButton;
 
 	
 
@@ -197,7 +197,7 @@ public class ModifyToolBar {
 		
 		
 		annotationButton = new TextButton("Annotation",
-				TabularDataResources.INSTANCE.column32());
+				TabularDataResources.INSTANCE.annotationAdd32());
 		annotationButton.setScale(ButtonScale.LARGE);
 		annotationButton.setIconAlign(IconAlign.TOP);
 		annotationButton.setToolTip("Add annotation column");