Minor Update

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@92874 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-03-10 14:21:30 +00:00
parent dd91b58390
commit 352d8d3b50
7 changed files with 150 additions and 40 deletions

View File

@ -254,3 +254,99 @@ Compiling...
Compilation completed in 0.00 seconds Compilation completed in 0.00 seconds
Removing invalidated units Removing invalidated units
Finding entry point classes 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

View File

@ -4,13 +4,7 @@
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module archiveName="tabular-data-expression-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-expression-widget/tabular-data-expression-widget"> <dependent-module archiveName="tabular-data-share-widget-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-share-widget/tabular-data-share-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-widgetx-tdx-source-1.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widgetx-tdx-source/tabular-data-widgetx-tdx-source">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-widgetx-1.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widgetx/tabular-data-widgetx">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
<dependent-module archiveName="tabular-data-widget-common-event-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widget-common-event/tabular-data-widget-common-event"> <dependent-module archiveName="tabular-data-widget-common-event-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widget-common-event/tabular-data-widget-common-event">
@ -19,15 +13,9 @@
<dependent-module archiveName="tabular-data-gwt-service-2.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-gwt-service/tabular-data-gwt-service"> <dependent-module archiveName="tabular-data-gwt-service-2.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-gwt-service/tabular-data-gwt-service">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </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"> <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> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
<dependent-module archiveName="tabular-data-toolbox-widget-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-toolbox-widget/tabular-data-toolbox-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="context-root" value="tabular-data-portlet"/> <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"/> <property name="java-output-path" value="/tabular-data-portlet/target/tabular-data-portlet-2.0.0-SNAPSHOT/WEB-INF/classes"/>
</wb-module> </wb-module>

18
pom.xml
View File

@ -138,13 +138,15 @@
<artifactId>workspace-light-tree</artifactId> <artifactId>workspace-light-tree</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.common</groupId> <groupId>org.gcube.common</groupId>
<artifactId>home-library</artifactId> <artifactId>home-library</artifactId>
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> <version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- TD Expression --> <!-- TD Expression -->
<dependency> <dependency>
@ -160,7 +162,12 @@
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> <version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<!-- tabular-data-share-widget -->
<dependency>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>tabular-data-share-widget</artifactId>
<version>[0.0.1-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency>
<!-- Apache Common Library --> <!-- Apache Common Library -->
<dependency> <dependency>
@ -241,8 +248,8 @@
<artifactId>tabular-data-sdmx-export-widget</artifactId> <artifactId>tabular-data-sdmx-export-widget</artifactId>
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version> <version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<!-- tabular-data-table-widget --> <!-- tabular-data-table-widget -->
<dependency> <dependency>
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
<artifactId>tabular-data-table-widget</artifactId> <artifactId>tabular-data-table-widget</artifactId>
@ -323,6 +330,9 @@
<version>${gwtVersion}</version> <version>${gwtVersion}</version>
<executions> <executions>
<execution> <execution>
<configuration>
<extraJvmArgs>-Xmx512M -Xss1024k -Dgwt.compiler.localWorkers=1</extraJvmArgs>
</configuration>
<goals> <goals>
<goal>compile</goal> <goal>compile</goal>
<goal>test</goal> <goal>test</goal>

View File

@ -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.openwidget.client.TDOpen;
import org.gcube.portlets.user.td.sdmxexportwidget.client.SDMXExportWizardTD; import org.gcube.portlets.user.td.sdmxexportwidget.client.SDMXExportWizardTD;
import org.gcube.portlets.user.td.sdmximportwidget.client.SDMXImportWizardTD; 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.CloneTabularResource;
import org.gcube.portlets.user.td.tablewidget.client.rows.DeleteRows; import org.gcube.portlets.user.td.tablewidget.client.rows.DeleteRows;
import org.gcube.portlets.user.td.taskswidget.client.TdTaskController; import org.gcube.portlets.user.td.taskswidget.client.TdTaskController;
@ -336,6 +337,7 @@ public class TabularDataController {
openTemplateNew(); openTemplateNew();
break; break;
case SHARE: case SHARE:
openShareWindow();
break; break;
case TIMELINE: case TIMELINE:
openTasksManagerWizard(); 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() { protected void openMultiColumnFilter() {
Log.debug("Request Open Multi Column Filter Dialog"); Log.debug("Request Open Multi Column Filter Dialog");
if (trId != null) { if (trId != null) {

View File

@ -51,7 +51,7 @@ public class FileToolBar {
protected TextButton exportJSONButton; protected TextButton exportJSONButton;
//Template //Template
protected TextButton templateOpenButton; //protected TextButton templateOpenButton;
private TextButton templateNewButton; private TextButton templateNewButton;
protected TextButton shareButton; protected TextButton shareButton;
@ -294,6 +294,27 @@ public class FileToolBar {
FlexTable templateLayout = new FlexTable(); FlexTable templateLayout = new FlexTable();
templateGroup.add(templateLayout); 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", templateOpenButton = new TextButton("Open",
TabularDataResources.INSTANCE.templateAdd32()); TabularDataResources.INSTANCE.templateAdd32());
templateOpenButton.enable(); templateOpenButton.enable();
@ -311,24 +332,8 @@ public class FileToolBar {
templateLayout.setWidget(0, 0, templateOpenButton); templateLayout.setWidget(0, 0, templateOpenButton);
templateLayout.getFlexCellFormatter().setRowSpan(0, 0, 2); 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()); cleanCells(templateLayout.getElement());
@ -511,7 +516,7 @@ public class FileToolBar {
exportCSVButton.disable(); exportCSVButton.disable();
exportJSONButton.disable(); exportJSONButton.disable();
exportSDMXButton.disable(); exportSDMXButton.disable();
templateOpenButton.enable(); //templateOpenButton.enable();
templateNewButton.enable(); templateNewButton.enable();
timelineButton.disable(); timelineButton.disable();
break; break;
@ -528,7 +533,7 @@ public class FileToolBar {
exportCSVButton.disable(); exportCSVButton.disable();
exportJSONButton.disable(); exportJSONButton.disable();
exportSDMXButton.disable(); exportSDMXButton.disable();
templateOpenButton.enable(); //templateOpenButton.enable();
templateNewButton.enable(); templateNewButton.enable();
timelineButton.disable(); timelineButton.disable();
break; break;
@ -536,7 +541,7 @@ public class FileToolBar {
openButton.enable(); openButton.enable();
cloneButton.enable(); cloneButton.enable();
closeButton.enable(); closeButton.enable();
shareButton.disable(); shareButton.enable();
deleteButton.enable(); deleteButton.enable();
propertiesButton.enable(); propertiesButton.enable();
importCSVButton.enable(); importCSVButton.enable();
@ -550,7 +555,7 @@ public class FileToolBar {
} }
exportCSVButton.enable(); exportCSVButton.enable();
exportJSONButton.disable(); exportJSONButton.disable();
templateOpenButton.enable(); //templateOpenButton.enable();
templateNewButton.enable(); templateNewButton.enable();
timelineButton.enable(); timelineButton.enable();
break; break;
@ -567,7 +572,7 @@ public class FileToolBar {
exportCSVButton.disable(); exportCSVButton.disable();
exportJSONButton.disable(); exportJSONButton.disable();
exportSDMXButton.disable(); exportSDMXButton.disable();
templateOpenButton.disable(); //templateOpenButton.disable();
templateNewButton.disable(); templateNewButton.disable();
timelineButton.disable(); timelineButton.disable();
break; break;

View File

@ -19,6 +19,7 @@
<inherits name='org.gcube.portlets.user.td.widgetcommonevent.WidgetCommonEvent' /> <inherits name='org.gcube.portlets.user.td.widgetcommonevent.WidgetCommonEvent' />
<inherits name='org.gcube.portlets.user.td.expressionwidget.ExpressionWidget' /> <inherits name='org.gcube.portlets.user.td.expressionwidget.ExpressionWidget' />
<inherits name='org.gcube.portlets.user.td.tablewidget.TableWidget'/> <inherits name='org.gcube.portlets.user.td.tablewidget.TableWidget'/>
<inherits name='org.gcube.portlets.user.td.sharewidget.ShareWidget' />
<inherits name='org.gcube.portlets.user.td.toolboxwidget.ToolBox' /> <inherits name='org.gcube.portlets.user.td.toolboxwidget.ToolBox' />
<inherits name='org.gcube.portlets.user.td.openwidget.TDOpen' /> <inherits name='org.gcube.portlets.user.td.openwidget.TDOpen' />

View File

@ -19,6 +19,7 @@
<inherits name='org.gcube.portlets.user.td.widgetcommonevent.WidgetCommonEvent' /> <inherits name='org.gcube.portlets.user.td.widgetcommonevent.WidgetCommonEvent' />
<inherits name='org.gcube.portlets.user.td.expressionwidget.ExpressionWidget' /> <inherits name='org.gcube.portlets.user.td.expressionwidget.ExpressionWidget' />
<inherits name='org.gcube.portlets.user.td.tablewidget.TableWidget'/> <inherits name='org.gcube.portlets.user.td.tablewidget.TableWidget'/>
<inherits name='org.gcube.portlets.user.td.sharewidget.ShareWidget' />
<inherits name='org.gcube.portlets.user.td.toolboxwidget.ToolBox' /> <inherits name='org.gcube.portlets.user.td.toolboxwidget.ToolBox' />
<inherits name='org.gcube.portlets.user.td.openwidget.TDOpen' /> <inherits name='org.gcube.portlets.user.td.openwidget.TDOpen' />