diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 8ad6fb0..443e085 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 21b1394..1e1a361 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,10 +4,7 @@
-
- uses
-
-
+
uses
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index 7893960..4045d87 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -3,5 +3,5 @@
-
+
diff --git a/pom.xml b/pom.xml
index ae9655a..278ee55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -234,7 +234,14 @@
tabular-data-toolbox-widget
1.0.0-SNAPSHOT
-
+
+
+
+ org.gcube.portlets.user
+ tabular-data-tasks-widget
+ 1.0.0-SNAPSHOT
+
+
com.allen-sauer.gwt.log
@@ -342,7 +349,7 @@
-
+
org.apache.maven.plugins
maven-compiler-plugin
@@ -444,7 +451,7 @@
- SA Plugin
+
org.apache.maven.plugins
maven-assembly-plugin
@@ -490,7 +497,7 @@
- -->
+
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 40ec217..1a3c966 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
@@ -9,6 +9,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.taskswidget.client.TdTaskController;
import org.gcube.portlets.user.td.widgetcommonevent.client.event.RibbonEvent;
import org.gcube.portlets.user.td.widgetcommonevent.client.event.UIStateEvent;
import org.gcube.portlets.user.td.widgetcommonevent.client.type.RibbonType;
@@ -22,6 +23,7 @@ import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.RunAsyncCallback;
import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.gwt.user.client.ui.DialogBox;
import com.google.web.bindery.event.shared.EventBus;
import com.google.web.bindery.event.shared.SimpleEventBus;
import com.sencha.gxt.widget.core.client.ContentPanel;
@@ -229,6 +231,9 @@ public class TabularDataController {
break;
case EXPORTJSON:
break;
+ case TASKSMANAGER:
+ openTasksManagerWizard();
+ break;
default:
break;
}
@@ -434,6 +439,19 @@ public class TabularDataController {
}
+ protected TdTaskController tdTaskController;
+ protected DialogBox tdTaskMainWindow;
+
+ protected void openTasksManagerWizard() {
+ tdTaskController = TdTaskController.getInstance();
+ TdTaskController.bindCommonBus(eventBus);
+ tdTaskMainWindow = tdTaskController.getWindowTaskMonitor(); // This is main panel
+ tdTaskMainWindow.show();
+
+ }
+
+
+
protected void asyncCodeLoadingFailed(Throwable reason) {
Log.error("Async code loading failed", reason);
Info.display("Async code loading failed",
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 15843f3..f227813 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
@@ -49,6 +49,8 @@ public class FileToolBar {
protected TextButton exportJSONButton;
protected TextButton templateButton;
+
+ protected TextButton taskButton;
public FileToolBar(EventBus eventBus) {
this.eventBus = eventBus;
@@ -85,7 +87,6 @@ public class FileToolBar {
openButton.addSelectHandler(new SelectHandler() {
-
public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.OPEN));
}
@@ -245,6 +246,7 @@ public class FileToolBar {
}
});
exportLayout.setWidget(1, 2, exportJSONButton);
+ cleanCells(exportLayout.getElement());
// Template
ButtonGroup templateGroup = new ButtonGroup();
@@ -274,8 +276,36 @@ public class FileToolBar {
templateLayout.setWidget(0, 0, templateButton);
templateLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
+ cleanCells(templateLayout.getElement());
- cleanCells(exportLayout.getElement());
+ // Task
+ ButtonGroup taskGroup = new ButtonGroup();
+ taskGroup.setId("Template");
+ taskGroup.setStyleName("ribbon");
+ taskGroup.setHeadingText("Task");
+ toolBar.add(taskGroup);
+
+ FlexTable taskLayout = new FlexTable();
+ taskGroup.add(taskLayout);
+
+ taskButton = new TextButton("Task",
+ TabularDataResources.INSTANCE.template32());
+ taskButton.disable();
+ taskButton.setToolTip("Task");
+ taskButton.setScale(ButtonScale.LARGE);
+ taskButton.setIconAlign(IconAlign.TOP);
+ taskButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
+ taskButton.addSelectHandler(new SelectHandler() {
+
+ public void onSelect(SelectEvent event) {
+ eventBus.fireEvent(new RibbonEvent(
+ RibbonType.TASKSMANAGER));
+ }
+ });
+
+ taskLayout.setWidget(0, 0, taskButton);
+ taskLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
+ cleanCells(taskLayout.getElement());
eventBus.addHandler(UIStateEvent.TYPE,
new UIStateEvent.UIStateHandler() {
@@ -314,6 +344,8 @@ public class FileToolBar {
exportCSVButton.disable();
exportJSONButton.disable();
exportSDMXButton.disable();
+ templateButton.disable();
+ taskButton.disable();
break;
case TR_CLOSE:
openButton.enable();
@@ -326,6 +358,8 @@ public class FileToolBar {
exportCSVButton.disable();
exportJSONButton.disable();
exportSDMXButton.disable();
+ templateButton.disable();
+ taskButton.disable();
break;
case TR_OPEN:
openButton.enable();
@@ -343,6 +377,8 @@ public class FileToolBar {
}
exportCSVButton.enable();
exportJSONButton.disable();
+ templateButton.disable();
+ taskButton.enable();
break;
case WIZARD_OPEN:
openButton.disable();
@@ -355,6 +391,8 @@ public class FileToolBar {
exportCSVButton.disable();
exportJSONButton.disable();
exportSDMXButton.disable();
+ templateButton.disable();
+ taskButton.disable();
break;
default:
break;
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 b6a0207..ef80d6d 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
@@ -4,7 +4,7 @@
-
+
@@ -18,6 +18,7 @@
+