Minor Update

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

src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java

@@ -502,6 +502,12 @@ public class TabularDataController {
 			case COLUMNDELETE:
 				openColumnDelete();
 				break;
+			case COLUMNSPLIT:
+				openColumnSplit();
+				break;
+			case COLUMNMERGE:
+				openColumnMerge();
+				break;
 			case DENORMALIZE:
 				break;
 			case NORMALIZE:
@@ -1054,6 +1060,43 @@ public class TabularDataController {
 			UtilsGXT3.alert("Error", "No tabular resource present");
 		}
 	}
+	
+	protected void openColumnSplit() {
+		openColumnSplit(null);
+	}
+
+	protected void openColumnSplit(String columnName) {
+		Log.debug("Request Split Column Tab");
+		if (trId != null) {
+			WidgetRequestEvent e = new WidgetRequestEvent(
+					WidgetRequestType.SPLITCOLUMNPANEL);
+			e.setTrId(trId);
+			e.setColumnName(columnName);
+			eventBus.fireEvent(e);
+		} else {
+			Log.error("TRId is null");
+			UtilsGXT3.alert("Error", "No tabular resource present");
+		}
+	}
+	
+	
+	protected void openColumnMerge() {
+		openColumnMerge(null);
+	}
+
+	protected void openColumnMerge(String columnName) {
+		Log.debug("Request Merge Column Tab");
+		if (trId != null) {
+			WidgetRequestEvent e = new WidgetRequestEvent(
+					WidgetRequestType.MERGECOLUMNPANEL);
+			e.setTrId(trId);
+			e.setColumnName(columnName);
+			eventBus.fireEvent(e);
+		} else {
+			Log.error("TRId is null");
+			UtilsGXT3.alert("Error", "No tabular resource present");
+		}
+	}
 
 	protected void openColumnLabel() {
 		openColumnLabel(null);

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

@@ -48,7 +48,10 @@ public class CurationToolBar {
 	protected TextButton tableTypeButton;
 	protected TextButton addColumnButton;
 	protected TextButton deleteColumnButton;
+	protected TextButton splitColumnButton;
+	protected TextButton mergeColumnButton;
 
+	
 	protected TextButton extractCodelistButton;
 	protected TextButton codelistMappingButton;
 	protected TextButton generateSummaryButton;
@@ -245,7 +248,43 @@ public class CurationToolBar {
 
 		structureLayout.setWidget(0, 4, deleteColumnButton);
 		structureLayout.getFlexCellFormatter().setRowSpan(0, 4, 2);
+		
+		//
+		splitColumnButton = new TextButton("Split Column",
+				TabularDataResources.INSTANCE.columnSplit32());
+		splitColumnButton.disable();
+		splitColumnButton.setScale(ButtonScale.LARGE);
+		splitColumnButton.setIconAlign(IconAlign.TOP);
+		splitColumnButton.setToolTip("Split Column");
+		splitColumnButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
+		splitColumnButton.addSelectHandler(new SelectHandler() {
 
+			public void onSelect(SelectEvent event) {
+				eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMNSPLIT));
+			}
+		});
+
+		structureLayout.setWidget(0, 5, splitColumnButton);
+		structureLayout.getFlexCellFormatter().setRowSpan(0, 5, 2);
+
+		mergeColumnButton = new TextButton("Merge Column",
+				TabularDataResources.INSTANCE.columnMerge32());
+		mergeColumnButton.disable();
+		mergeColumnButton.setScale(ButtonScale.LARGE);
+		mergeColumnButton.setIconAlign(IconAlign.TOP);
+		mergeColumnButton.setToolTip("Merge Column");
+		mergeColumnButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
+		mergeColumnButton.addSelectHandler(new SelectHandler() {
+
+			public void onSelect(SelectEvent event) {
+				eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMNMERGE));
+			}
+		});
+
+		structureLayout.setWidget(0, 6, mergeColumnButton);
+		structureLayout.getFlexCellFormatter().setRowSpan(0, 6, 2);
+		//
+		
 		denormalizeButton = new TextButton("Denormalize",
 				TabularDataResources.INSTANCE.tableDenormalize32());
 		denormalizeButton.disable();
@@ -260,8 +299,8 @@ public class CurationToolBar {
 			}
 		});
 
-		structureLayout.setWidget(0, 5, denormalizeButton);
-		structureLayout.getFlexCellFormatter().setRowSpan(0, 5, 2);
+		structureLayout.setWidget(0, 7, denormalizeButton);
+		structureLayout.getFlexCellFormatter().setRowSpan(0, 7, 2);
 
 		normalizeButton = new TextButton("Normalize",
 				TabularDataResources.INSTANCE.tableNormalize32());
@@ -277,8 +316,9 @@ public class CurationToolBar {
 			}
 		});
 
-		structureLayout.setWidget(0, 6, normalizeButton);
-		structureLayout.getFlexCellFormatter().setRowSpan(0, 6, 2);
+		structureLayout.setWidget(0, 8, normalizeButton);
+		structureLayout.getFlexCellFormatter().setRowSpan(0, 8, 2);
+		
 		cleanCells(structureLayout.getElement());
 
 		// Helper
@@ -382,6 +422,8 @@ public class CurationToolBar {
 				tableTypeButton.disable();
 				addColumnButton.disable();
 				deleteColumnButton.disable();
+				splitColumnButton.disable();
+				mergeColumnButton.disable();
 				extractCodelistButton.disable();
 				codelistMappingButton.disable();
 				generateSummaryButton.disable();
@@ -399,6 +441,8 @@ public class CurationToolBar {
 				tableTypeButton.disable();
 				addColumnButton.disable();
 				deleteColumnButton.disable();
+				splitColumnButton.disable();
+				mergeColumnButton.disable();
 				extractCodelistButton.disable();
 				codelistMappingButton.disable();
 				generateSummaryButton.disable();
@@ -417,6 +461,8 @@ public class CurationToolBar {
 				tableTypeButton.enable();
 				addColumnButton.enable();
 				deleteColumnButton.enable();
+				splitColumnButton.enable();
+				mergeColumnButton.enable();
 				extractCodelistButton.enable();
 				TRId trId = event.getTrId();
 				if (trId != null && trId.getTableType() != null
@@ -439,6 +485,8 @@ public class CurationToolBar {
 				tableTypeButton.disable();
 				addColumnButton.disable();
 				deleteColumnButton.disable();
+				splitColumnButton.disable();
+				mergeColumnButton.disable();
 				extractCodelistButton.disable();
 				codelistMappingButton.disable();
 				generateSummaryButton.disable();

templates/changelog.xml

@@ -5,6 +5,24 @@
 		<Change>Added History</Change>
 		<Change>Added Validations</Change>
 		<Change>Added Inline Filter</Change>
+		<Change>Added Extract Codelist</Change>
+		<Change>Added Codelist Mapping Import</Change>
+		<Change>Added Add Column</Change>
+		<Change>Added Merge Column</Change>
+		<Change>Added Split Column</Change>
+		<Change>Added Add Row</Change>
+		<Change>Added Edit Row</Change>
+	    <Change>Updated Commons Event</Change>
+		<Change>Updated Toolbox</Change>
+		<Change>Updated CSV Export</Change>
+		<Change>Updated SDMX Export</Change>
+		<Change>Updated CSV Import</Change>
+		<Change>Updated SDMX Import</Change>
+		<Change>Updated Open Tabular Resource</Change>
+		<Change>Updated context menu of grid</Change>
+		<Change>Updated header column menu of grid</Change>
+		<Change>Updated TabularDataController</Change>
+		<Change>Updated Ribbon</Change>
 	</Changeset>
 	<Changeset component="${groupId}.${artifactId}.2-1-0"
 		date="2014-04-04">