diff --git a/.gwt/.gwt-log b/.gwt/.gwt-log index c53c9ba..41719f9 100644 --- a/.gwt/.gwt-log +++ b/.gwt/.gwt-log @@ -30,3 +30,163 @@ 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... + 50% complete (ETR: 4 seconds) + 50% complete (ETR: 4 seconds) + 50% complete (ETR: 4 seconds) + 50% complete (ETR: 4 seconds) + 50% complete (ETR: 4 seconds) + 50% complete (ETR: 4 seconds) + 60% complete (ETR: 3 seconds) + 70% complete (ETR: 2 seconds) + 80% complete (ETR: 1 seconds) + 90% complete (ETR: 1 seconds) + 100% complete (ETR: 0 seconds) + Compilation completed in 14.96 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: 14 seconds) + 20% complete (ETR: 14 seconds) + 20% complete (ETR: 14 seconds) + 30% complete (ETR: 13 seconds) + 40% complete (ETR: 12 seconds) + 50% complete (ETR: 12 seconds) + 60% complete (ETR: 8 seconds) + 70% complete (ETR: 6 seconds) + 80% complete (ETR: 3 seconds) + 90% complete (ETR: 2 seconds) + 100% complete (ETR: 0 seconds) + Compilation completed in 21.30 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... + 30% complete (ETR: 11 seconds) + 30% complete (ETR: 11 seconds) + 30% complete (ETR: 11 seconds) + 30% complete (ETR: 11 seconds) + 40% complete (ETR: 8 seconds) + 50% complete (ETR: 6 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 10.79 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: 12 seconds) + 40% complete (ETR: 9 seconds) + 50% complete (ETR: 6 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 11.66 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... + 10% complete (ETR: 24 seconds) + 10% complete (ETR: 24 seconds) + 20% complete (ETR: 21 seconds) + 30% complete (ETR: 15 seconds) + 40% complete (ETR: 11 seconds) + 50% complete (ETR: 8 seconds) + 60% complete (ETR: 5 seconds) + 70% complete (ETR: 4 seconds) + 80% complete (ETR: 2 seconds) + 90% complete (ETR: 1 seconds) + 100% complete (ETR: 0 seconds) + Compilation completed in 14.91 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 1d3727b..aff542d 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -7,28 +7,10 @@ uses - - uses - - - uses - - - uses - uses - - uses - - - uses - - - uses - - + uses diff --git a/pom.xml b/pom.xml index 95bdd98..294d013 100644 --- a/pom.xml +++ b/pom.xml @@ -139,8 +139,8 @@ [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) provided - - + + org.gcube.portlets.user @@ -251,9 +251,12 @@ [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT] - + + + org.gcube.portlets.user.tdtemplate + tabular-data-template + [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT] + 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 b324f59..716e7ae 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 @@ -25,6 +25,7 @@ import org.gcube.portlets.user.td.widgetcommonevent.client.type.WidgetRequestTyp import org.gcube.portlets.user.td.widgetcommonevent.shared.GridHeaderOperationId; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import org.gcube.portlets.user.td.wizardwidget.client.WizardListener; +import org.gcube.portlets.user.tdtemplate.client.TdTemplateController; //import org.gcube.portlets.user.tdtemplate.client.TdTemplateController; import org.gcube.portlets.user.tdwx.client.TabularDataX; import org.gcube.portlets.user.tdwx.shared.model.TableId; @@ -623,10 +624,11 @@ public class TabularDataController { } protected void openTemplateNew(){ - /* + TdTemplateController tdTemplateController= new TdTemplateController(); tdTemplateController.getWindowTemplatePanel().show(); - */ + + } protected void openTemplateOpen(){ 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 70ef970..4f5e942 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 @@ -525,8 +525,8 @@ public class FileToolBar { } exportCSVButton.enable(); exportJSONButton.disable(); - templateOpenButton.disable(); - templateNewButton.disable(); + templateOpenButton.enable(); + templateNewButton.enable(); timelineButton.enable(); break; case WIZARD_OPEN: 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 b352287..728969f 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 @@ -28,7 +28,7 @@ - + @@ -37,11 +37,11 @@ - - - - - + + + + + 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 4975174..0f89df0 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 @@ -28,18 +28,18 @@ - + - - - - - + + + + +