diff --git a/.classpath b/.classpath
index 67a8039..3544139 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
-
+
-
+
@@ -45,5 +45,5 @@
-
+
diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index 6d6f9dc..08d8336 100644
--- a/.settings/com.google.gdt.eclipse.core.prefs
+++ b/.settings/com.google.gdt.eclipse.core.prefs
@@ -1,5 +1,5 @@
eclipse.preferences.version=1
jarsExcludedFromWebInfLib=
-lastWarOutDir=/home/giancarlo/workspace/tabular-data-portlet/target/tabular-data-portlet-2.0.0-SNAPSHOT
+lastWarOutDir=/home/giancarlo/workspace/tabular-data-portlet/target/tabular-data-portlet-2.1.0-SNAPSHOT
warSrcDir=src/main/webapp
warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index b17b154..a919bd3 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,31 +4,37 @@
-
+
uses
-
+
uses
-
+
uses
-
+
uses
-
+
uses
-
+
uses
-
+
uses
-
+
uses
-
+
+ uses
+
+
+ uses
+
+
uses
diff --git a/log.txt b/log.txt
deleted file mode 100644
index be95382..0000000
--- a/log.txt
+++ /dev/null
@@ -1 +0,0 @@
-0 [1848249397@qtp-190359739-4] INFO gwt-log - Start upload file
diff --git a/pom.xml b/pom.xml
index 294d013..7a37488 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
4.0.0
org.gcube.portlets.user
tabular-data-portlet
- 2.0.0-SNAPSHOT
+ 2.1.0-SNAPSHOT
tabular-data-portlet
tabular-data-portlet manages tabular data
@@ -122,6 +122,11 @@
aslcore
+
+ org.gcube.applicationsupportlayer
+ accesslogger
+
+
org.gcube.portlets.user
gcube-widgets
diff --git a/src/main/java/org/gcube/portlets/user/td/client/Constants.java b/src/main/java/org/gcube/portlets/user/td/client/Constants.java
index b2aa3b4..71ce7cd 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/Constants.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/Constants.java
@@ -14,12 +14,6 @@ package org.gcube.portlets.user.td.client;
*/
public class Constants {
- public static String VERSION = "1.0.0";
- public static boolean TEST_MODE = false;
- public final static String DEFAULT_USER = "giancarlo.panichi";
-
-
- public static final String DEFAULT_SCOPE = "/gcube/devsec";
public static final String TDX_DATASOURCE_FACTORY_ID = "TDXDataSourceFactory";
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 a3e9249..a38de48 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
@@ -54,11 +54,12 @@ import com.sencha.gxt.widget.core.client.info.Info;
*/
public class TabularDataController {
// implements HasCloseHandlers, HasOpenHandlers {
-
+
protected SimpleEventBus eventBus;
protected TabularDataX tabularData;
protected UIStateType uiState = UIStateType.START;
+ private boolean taskManagerInit = false;
protected TdTaskController tdTaskController;
protected ContentPanel toolBoxPanel;
@@ -73,12 +74,12 @@ public class TabularDataController {
* Grid TableId
*/
protected TableId tableOpening;
-
+
+
+
+
public TabularDataController() {
eventBus = new SimpleEventBus();
- tdTaskController = TdTaskController.getInstance();
- TdTaskController.bindCommonBus(eventBus);
- tdTaskMainWindow = tdTaskController.getWindowTaskMonitor();
bindToEvents();
}
@@ -108,8 +109,8 @@ public class TabularDataController {
public void setWestData(BorderLayoutData westData) {
this.westData = westData;
}
-
- //Bind Controller to events on bus
+
+ // Bind Controller to events on bus
protected void bindToEvents() {
eventBus.addHandler(
GridHeaderColumnMenuItemEvent.TYPE,
@@ -157,8 +158,8 @@ public class TabularDataController {
eventBus.fireEvent(new UIStateEvent(UIStateType.START));
}
-
- //Simple alert
+
+ // Simple alert
protected void alertMessage(String reason, String details) {
AlertMessageBox d = new AlertMessageBox(reason, details);
d.addHideHandler(new HideHandler() {
@@ -170,8 +171,8 @@ public class TabularDataController {
});
d.show();
}
-
- //Resume state of user interface
+
+ // Resume state of user interface
protected void resumeUIState() {
try {
if (uiState == UIStateType.TR_OPEN) {
@@ -187,8 +188,8 @@ public class TabularDataController {
Log.debug("Resume :" + e.getLocalizedMessage());
}
}
-
- //Open Table
+
+ // Open Table
protected void openTable(TRId tabularResourceId) {
Log.debug("openTabe: " + tabularResourceId);
trId = tabularResourceId;
@@ -201,8 +202,7 @@ public class TabularDataController {
eventBus.fireEvent(uiStateEvent);
}
-
- //Close Tabular Resource
+ // Close Tabular Resource
protected void closeTabularResource() {
if (uiState == UIStateType.TR_OPEN) {
Log.debug("CloseTabularResource Open");
@@ -618,42 +618,53 @@ public class TabularDataController {
protected com.extjs.gxt.ui.client.widget.Window tdTaskMainWindow;
protected void openTasksManagerWizard() {
+ initTaskManager();
tdTaskMainWindow.setPosition((Window.getClientWidth() / 2) - 200,
(Window.getClientHeight() / 2) - 300);
tdTaskController.updateTasks(true);
tdTaskMainWindow.show();
}
-
- protected void openTemplateNew(){
-
- TdTemplateController tdTemplateController= new TdTemplateController();
+
+ protected void initTaskManager() {
+ if (!taskManagerInit) {
+ taskManagerInit = true;
+ tdTaskController = TdTaskController.getInstance();
+ TdTaskController.bindCommonBus(eventBus);
+ tdTaskMainWindow = tdTaskController.getWindowTaskMonitor();
+ } else {
+
+ }
+ }
+
+ protected void openTemplateNew() {
+
+ TdTemplateController tdTemplateController = new TdTemplateController();
tdTemplateController.getWindowTemplatePanel().show();
-
-
+
}
-
- protected void openTemplateOpen(){
-
+
+ protected void openTemplateOpen() {
+
}
-
+
protected void openMultiColumnFilter() {
Log.debug("Request Open Multi Column Filter Dialog");
if (trId != null) {
- MultiColumnFilterDialog mcfDialog=new MultiColumnFilterDialog(trId, eventBus);
+ MultiColumnFilterDialog mcfDialog = new MultiColumnFilterDialog(
+ trId, eventBus);
mcfDialog.show();
}
}
-
-
+
protected void openColumnFilter(String columnName) {
Log.debug("Request Open Column Filter Dialog");
if (trId != null) {
- ColumnFilterDialog cfDialog=new ColumnFilterDialog(trId, columnName, eventBus);
+ ColumnFilterDialog cfDialog = new ColumnFilterDialog(trId,
+ columnName, eventBus);
cfDialog.show();
}
}
-
-
+
protected void openColumnType() {
openColumnType(null);
}
@@ -668,11 +679,7 @@ public class TabularDataController {
eventBus.fireEvent(e);
}
}
-
-
-
-
-
+
protected void openColumnDelete() {
openColumnDelete(null);
}
@@ -687,7 +694,7 @@ public class TabularDataController {
eventBus.fireEvent(e);
}
}
-
+
protected void openColumnLabel() {
openColumnLabel(null);
}
@@ -702,7 +709,6 @@ public class TabularDataController {
eventBus.fireEvent(e);
}
}
-
protected void openTableType() {
Log.debug("Request Change Table Type Tab");
@@ -713,14 +719,13 @@ public class TabularDataController {
eventBus.fireEvent(e);
}
}
-
-
-
- protected void doChangeTableRequestEventCommand(ChangeTableRequestEvent event){
- Log.debug("Change Table Request to "+event.getTrId());
+
+ protected void doChangeTableRequestEventCommand(
+ ChangeTableRequestEvent event) {
+ Log.debug("Change Table Request to " + event.getTrId());
openTable(event.getTrId());
};
-
+
protected void doGridHeaderColumnMenuCommand(
GridHeaderColumnMenuItemEvent event) {
Log.debug("GridHeaderColumnMenu Fire Event",
@@ -729,8 +734,7 @@ public class TabularDataController {
String opId = event.getOperationId();
String columnName = tabularData.getColumnId(event.getColumnSelected());
Log.debug("GridColumnName: " + columnName);
-
-
+
if (opId.compareTo(GridHeaderOperationId.COLUMNLABEL.toString()) == 0) {
openColumnLabel(columnName);
} else {
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 7754f0a..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
@@ -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 9e451ac..83587a6 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
@@ -35,12 +35,12 @@
-
-
-
-
-
-
+
+
+
+
+
+