From 352d8d3b50926646a9ca0eb4a2c4a254b732be7e Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Mon, 10 Mar 2014 14:21:30 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@92874 82a268e6-3cf1-43bd-a215-b396298e98cf --- .gwt/.gwt-log | 96 +++++++++++++++++++ .settings/org.eclipse.wst.common.component | 14 +-- pom.xml | 18 +++- .../user/td/client/TabularDataController.java | 9 ++ .../user/td/client/ribbon/FileToolBar.java | 51 +++++----- .../user/td/tabulardataportlet.gwt.xml | 1 + .../user/td/tabulardataportlet.gwt.xml | 1 + 7 files changed, 150 insertions(+), 40 deletions(-) diff --git a/.gwt/.gwt-log b/.gwt/.gwt-log index cdf0ed2..5881093 100644 --- a/.gwt/.gwt-log +++ b/.gwt/.gwt-log @@ -254,3 +254,99 @@ Compiling... Compilation completed in 0.00 seconds Removing invalidated units Finding entry point classes +Public resources found in... +Translatable source found in... +Found 0 cached/archived units. Used 0 / 2719 units from cache. +Compiling... + 30% complete (ETR: 8 seconds) + 30% complete (ETR: 8 seconds) + 30% complete (ETR: 8 seconds) + 30% complete (ETR: 8 seconds) + 40% complete (ETR: 8 seconds) + 50% complete (ETR: 5 seconds) + 60% complete (ETR: 4 seconds) + 70% complete (ETR: 3 seconds) + 80% complete (ETR: 2 seconds) + 90% complete (ETR: 1 seconds) + 100% complete (ETR: 0 seconds) + Compilation completed in 13.31 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 2719 cached/archived units. Used 2719 / 2719 units from cache. +Compiling... + Compilation completed in 0.00 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 2719 cached/archived units. Used 2719 / 2719 units from cache. +Compiling... + Compilation completed in 0.00 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 0 cached/archived units. Used 0 / 2719 units from cache. +Compiling... + 70% complete (ETR: 2 seconds) + 70% complete (ETR: 2 seconds) + 70% complete (ETR: 2 seconds) + 70% complete (ETR: 2 seconds) + 70% complete (ETR: 2 seconds) + 70% complete (ETR: 2 seconds) + 70% complete (ETR: 2 seconds) + 70% complete (ETR: 2 seconds) + 80% complete (ETR: 1 seconds) + 90% complete (ETR: 1 seconds) + 100% complete (ETR: 0 seconds) + Compilation completed in 7.99 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 2719 cached/archived units. Used 2719 / 2719 units from cache. +Compiling... + Compilation completed in 0.00 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 2719 cached/archived units. Used 2719 / 2719 units from cache. +Compiling... + Compilation completed in 0.00 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 0 cached/archived units. Used 0 / 2719 units from cache. +Compiling... + 20% complete (ETR: 15 seconds) + 20% complete (ETR: 15 seconds) + 20% complete (ETR: 15 seconds) + 30% complete (ETR: 13 seconds) + 40% complete (ETR: 10 seconds) + 50% complete (ETR: 7 seconds) + 60% complete (ETR: 5 seconds) + 70% complete (ETR: 3 seconds) + 80% complete (ETR: 2 seconds) + 90% complete (ETR: 1 seconds) + 100% complete (ETR: 0 seconds) + Compilation completed in 13.25 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 2719 cached/archived units. Used 2719 / 2719 units from cache. +Compiling... + Compilation completed in 0.00 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 2719 cached/archived units. Used 2719 / 2719 units from cache. +Compiling... + Compilation completed in 0.00 seconds +Removing invalidated units +Finding entry point classes diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 48bcc83..eed8435 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -4,13 +4,7 @@ - - uses - - - uses - - + uses @@ -19,15 +13,9 @@ uses - - uses - uses - - uses - diff --git a/pom.xml b/pom.xml index 32c6b78..2edbfd1 100644 --- a/pom.xml +++ b/pom.xml @@ -138,13 +138,15 @@ workspace-light-tree + org.gcube.common home-library [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) provided - + + @@ -160,7 +162,12 @@ [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) - + + + org.gcube.portlets.user + tabular-data-share-widget + [0.0.1-SNAPSHOT,2.0.0-SNAPSHOT) + @@ -241,8 +248,8 @@ tabular-data-sdmx-export-widget [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) - - + + org.gcube.portlets.user tabular-data-table-widget @@ -323,6 +330,9 @@ ${gwtVersion} + + -Xmx512M -Xss1024k -Dgwt.compiler.localWorkers=1 + compile test 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 25c7590..435f586 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 @@ -13,6 +13,7 @@ import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; import org.gcube.portlets.user.td.openwidget.client.TDOpen; import org.gcube.portlets.user.td.sdmxexportwidget.client.SDMXExportWizardTD; import org.gcube.portlets.user.td.sdmximportwidget.client.SDMXImportWizardTD; +import org.gcube.portlets.user.td.sharewidget.client.TRShare; import org.gcube.portlets.user.td.tablewidget.client.CloneTabularResource; import org.gcube.portlets.user.td.tablewidget.client.rows.DeleteRows; import org.gcube.portlets.user.td.taskswidget.client.TdTaskController; @@ -336,6 +337,7 @@ public class TabularDataController { openTemplateNew(); break; case SHARE: + openShareWindow(); break; case TIMELINE: openTasksManagerWizard(); @@ -686,6 +688,13 @@ public class TabularDataController { } + protected void openShareWindow(){ + Log.debug("Open Share Window"); + @SuppressWarnings("unused") + TRShare trShare=new TRShare(trId,eventBus); + } + + protected void openMultiColumnFilter() { Log.debug("Request Open Multi Column Filter Dialog"); if (trId != null) { 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 ac8f7b6..b167e2b 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 @@ -51,7 +51,7 @@ public class FileToolBar { protected TextButton exportJSONButton; //Template - protected TextButton templateOpenButton; + //protected TextButton templateOpenButton; private TextButton templateNewButton; protected TextButton shareButton; @@ -294,6 +294,27 @@ public class FileToolBar { FlexTable templateLayout = new FlexTable(); templateGroup.add(templateLayout); + + + templateNewButton = new TextButton("New", + TabularDataResources.INSTANCE.templateEdit32()); + templateNewButton.enable(); + templateNewButton.setToolTip("New"); + templateNewButton.setScale(ButtonScale.LARGE); + templateNewButton.setIconAlign(IconAlign.TOP); + templateNewButton.setArrowAlign(ButtonArrowAlign.BOTTOM); + templateNewButton.addSelectHandler(new SelectHandler() { + + public void onSelect(SelectEvent event) { + eventBus.fireEvent(new RibbonEvent( + RibbonType.TEMPLATENEW)); + } + }); + + templateLayout.setWidget(0, 0, templateNewButton); + templateLayout.getFlexCellFormatter().setRowSpan(0, 0, 2); + + /* templateOpenButton = new TextButton("Open", TabularDataResources.INSTANCE.templateAdd32()); templateOpenButton.enable(); @@ -311,24 +332,8 @@ public class FileToolBar { templateLayout.setWidget(0, 0, templateOpenButton); templateLayout.getFlexCellFormatter().setRowSpan(0, 0, 2); + */ - templateNewButton = new TextButton("New", - TabularDataResources.INSTANCE.templateEdit32()); - templateNewButton.enable(); - templateNewButton.setToolTip("New"); - templateNewButton.setScale(ButtonScale.LARGE); - templateNewButton.setIconAlign(IconAlign.TOP); - templateNewButton.setArrowAlign(ButtonArrowAlign.BOTTOM); - templateNewButton.addSelectHandler(new SelectHandler() { - - public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent( - RibbonType.TEMPLATENEW)); - } - }); - - templateLayout.setWidget(0, 1, templateNewButton); - templateLayout.getFlexCellFormatter().setRowSpan(0, 1, 2); cleanCells(templateLayout.getElement()); @@ -511,7 +516,7 @@ public class FileToolBar { exportCSVButton.disable(); exportJSONButton.disable(); exportSDMXButton.disable(); - templateOpenButton.enable(); + //templateOpenButton.enable(); templateNewButton.enable(); timelineButton.disable(); break; @@ -528,7 +533,7 @@ public class FileToolBar { exportCSVButton.disable(); exportJSONButton.disable(); exportSDMXButton.disable(); - templateOpenButton.enable(); + //templateOpenButton.enable(); templateNewButton.enable(); timelineButton.disable(); break; @@ -536,7 +541,7 @@ public class FileToolBar { openButton.enable(); cloneButton.enable(); closeButton.enable(); - shareButton.disable(); + shareButton.enable(); deleteButton.enable(); propertiesButton.enable(); importCSVButton.enable(); @@ -550,7 +555,7 @@ public class FileToolBar { } exportCSVButton.enable(); exportJSONButton.disable(); - templateOpenButton.enable(); + //templateOpenButton.enable(); templateNewButton.enable(); timelineButton.enable(); break; @@ -567,7 +572,7 @@ public class FileToolBar { exportCSVButton.disable(); exportJSONButton.disable(); exportSDMXButton.disable(); - templateOpenButton.disable(); + //templateOpenButton.disable(); templateNewButton.disable(); timelineButton.disable(); break; diff --git a/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml b/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml index 4bc4276..aa5d678 100644 --- a/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml +++ b/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml @@ -19,6 +19,7 @@ + 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 ae04ae7..994870e 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 @@ -19,6 +19,7 @@ +