gCubeSystem
/
tabular-data-manager
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor Updated 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@92792 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-03-06 18:48:23 +00:00
parent 5c9da5f05e
commit f6ee49a799
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.settings/org.eclipse.wst.common.component
View File

@ -19,6 +19,9 @@
<dependent-module archiveName="tabular-data-wizard-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-wizard-widget/tabular-data-wizard-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-csv-export-widget-1.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-csv-export-widget/tabular-data-csv-export-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-table-widget-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-table-widget/tabular-data-table-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
@ -28,6 +31,9 @@
<dependent-module archiveName="tabular-data-information-widget-2.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-information-widget/tabular-data-information-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-column-widget-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-column-widget/tabular-data-column-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="context-root" value="tabular-data-portlet"/>
<property name="java-output-path" value="/tabular-data-portlet/target/tabular-data-portlet-2.0.0-SNAPSHOT/WEB-INF/classes"/>
</wb-module>

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

@ -387,6 +387,7 @@ public class TabularDataController {
case ROWDELETE:
break;
case DUPLICATEDELETE:
openDuplicateDelete();
break;
case ANNOTATIONADD:
break;
@ -752,6 +753,17 @@ public class TabularDataController {
eventBus.fireEvent(e);
}
}
protected void openDuplicateDelete() {
Log.debug("Request Duplicate Delete Tab");
if (trId != null) {
WidgetRequestEvent e = new WidgetRequestEvent(
WidgetRequestType.DUPLICATEDELETEPANEL);
e.setTrId(trId);
eventBus.fireEvent(e);
}
}
protected void doChangeTableRequestEventCommand(
ChangeTableRequestEvent event) {

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

@ -67,7 +67,7 @@ public class ModifyToolBar {
tableGroup.setId("Table");
tableGroup.setStyleName("ribbon");
tableGroup.setHeadingText("Table");
tableGroup.disable();
tableGroup.enable();
toolBar.add(tableGroup);
FlexTable tableLayout = new FlexTable();
@ -75,6 +75,7 @@ public class ModifyToolBar {
filterButton = new TextButton("Filter",
TabularDataResources.INSTANCE.filter32());
filterButton.disable();
filterButton.setScale(ButtonScale.LARGE);
filterButton.setIconAlign(IconAlign.TOP);
filterButton.setToolTip("Filter table data");
@ -92,6 +93,7 @@ public class ModifyToolBar {
unionButton = new TextButton("Union",
TabularDataResources.INSTANCE.union32());
unionButton.disable();
unionButton.setScale(ButtonScale.LARGE);
unionButton.setIconAlign(IconAlign.TOP);
unionButton.setToolTip("Merge tables data");
@ -110,6 +112,7 @@ public class ModifyToolBar {
groupbyButton = new TextButton("Group By",
TabularDataResources.INSTANCE.group32());
groupbyButton.disable();
groupbyButton.setScale(ButtonScale.LARGE);
groupbyButton.setIconAlign(IconAlign.TOP);
groupbyButton.setToolTip("Perform data grouping");
@ -127,6 +130,7 @@ public class ModifyToolBar {
aggregateButton = new TextButton("Aggregate",
TabularDataResources.INSTANCE.aggregate32());
aggregateButton.disable();
aggregateButton.setScale(ButtonScale.LARGE);
aggregateButton.setIconAlign(IconAlign.TOP);
aggregateButton.setToolTip("Performs data aggregation");
@ -144,6 +148,7 @@ public class ModifyToolBar {
addRowButton = new TextButton("Add Row",
TabularDataResources.INSTANCE.rowInsert32());
addRowButton.disable();
addRowButton.setScale(ButtonScale.LARGE);
addRowButton.setIconAlign(IconAlign.TOP);
addRowButton.setToolTip("Add row");
@ -161,6 +166,7 @@ public class ModifyToolBar {
deleteRowButton = new TextButton("Delete Row",
TabularDataResources.INSTANCE.rowRemove32());
deleteRowButton.disable();
deleteRowButton.setScale(ButtonScale.LARGE);
deleteRowButton.setIconAlign(IconAlign.TOP);
deleteRowButton.setToolTip("Delete row");
@ -178,6 +184,7 @@ public class ModifyToolBar {
deleteDuplicateButton = new TextButton("Delete Duplicate",
TabularDataResources.INSTANCE.tableDuplicateRowsRemove32());
deleteDuplicateButton.disable();
deleteDuplicateButton.setScale(ButtonScale.LARGE);
deleteDuplicateButton.setIconAlign(IconAlign.TOP);
deleteDuplicateButton.setToolTip("Delete duplicate row");
@ -185,8 +192,7 @@ public class ModifyToolBar {
deleteDuplicateButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
// eventBus.fireEvent(new
// ImportTableEvent(ImportTableType.JSON));
eventBus.fireEvent(new RibbonEvent(RibbonType.DUPLICATEDELETE));
}
});
@ -196,6 +202,7 @@ public class ModifyToolBar {
annotationButton = new TextButton("Annotation",
TabularDataResources.INSTANCE.annotationAdd32());
annotationButton.disable();
annotationButton.setScale(ButtonScale.LARGE);
annotationButton.setIconAlign(IconAlign.TOP);
annotationButton.setToolTip("Add annotation column");
@ -332,7 +339,7 @@ public class ModifyToolBar {
aggregateButton.disable();
addRowButton.disable();
deleteRowButton.disable();
deleteDuplicateButton.disable();
deleteDuplicateButton.enable();
annotationButton.disable();
// Column
filterColumnButton.enable();