gCubeSystem
/
tabular-data-manager
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated TRId 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@100940 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-10-23 16:42:45 +00:00
parent c3de859537
commit 8cd4c0e6e4
6 changed files with 264 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
.gwt/.gwt-log
View File

@ -30,3 +30,67 @@ 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...
40% complete (ETR: 6 seconds)
40% complete (ETR: 6 seconds)
40% complete (ETR: 6 seconds)
40% complete (ETR: 6 seconds)
40% complete (ETR: 6 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 19.49 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: 9 seconds)
30% complete (ETR: 9 seconds)
30% complete (ETR: 9 seconds)
30% complete (ETR: 8 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 13.70 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

3
pom.xml
View File

@ -384,11 +384,12 @@
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency>
<!--
<dependency>
<groupId>org.gwtopenmaps.openlayers</groupId>
<artifactId>gwt-openlayers-client</artifactId>
<version>0.6</version>
</dependency>
</dependency> -->
<!--tabular-data-tasks-widget -->
<dependency>

232
src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
View File

@ -116,7 +116,7 @@ public class TabularDataController {
/**
* Grid TableId
*/
//protected TableId tableOpening;
// protected TableId tableOpening;
private TRId openTRIdAfterServerUpdate;
@ -319,7 +319,7 @@ public class TabularDataController {
TDGWTServiceAsync.INSTANCE.restoreUISession(new AsyncCallback<TRId>() {
public void onFailure(Throwable caught) {
}
public void onSuccess(TRId trId) {
@ -335,13 +335,13 @@ public class TabularDataController {
}
//TODO
// TODO
protected void putInBackgroundUIState() {
try {
requestCloseCurrent();
//closeAllTabularResource();
//openBackgroundMonitor();
//openTabularResource(true);
// closeAllTabularResource();
// openBackgroundMonitor();
// openTabularResource(true);
} catch (Exception e) {
Log.debug("Put In Background :" + e.getLocalizedMessage());
@ -397,8 +397,8 @@ public class TabularDataController {
protected void openTable(TRId tabularResourceId) {
Log.debug("openTable: " + tabularResourceId);
trId = tabularResourceId;
//tableOpening = new TableId(Constants.TDX_DATASOURCE_FACTORY_ID,
// trId.getTableId());
// tableOpening = new TableId(Constants.TDX_DATASOURCE_FACTORY_ID,
// trId.getTableId());
// tabularData.openTable(tableOpening);
uiState = UIStateType.TR_OPEN;
UIStateEvent uiStateEvent = new UIStateEvent(UIStateType.TR_OPEN);
@ -410,8 +410,8 @@ public class TabularDataController {
protected void updateTable(TRId tabularResourceId) {
Log.debug("updateTable: " + tabularResourceId);
trId = tabularResourceId;
//tableOpening = new TableId(Constants.TDX_DATASOURCE_FACTORY_ID,
// trId.getTableId());
// tableOpening = new TableId(Constants.TDX_DATASOURCE_FACTORY_ID,
// trId.getTableId());
// tabularData.openTable(tableOpening);
uiState = UIStateType.TABLEUPDATE;
UIStateEvent uiStateEvent = new UIStateEvent(UIStateType.TABLEUPDATE);
@ -423,8 +423,8 @@ public class TabularDataController {
protected void updateTableForCuration(TRId tabularResourceId) {
Log.debug("updateTableForCuration: " + tabularResourceId);
trId = tabularResourceId;
//tableOpening = new TableId(Constants.TDX_DATASOURCE_FACTORY_ID,
// trId.getTableId());
// tableOpening = new TableId(Constants.TDX_DATASOURCE_FACTORY_ID,
// trId.getTableId());
// tabularData.openTable(tableOpening);
uiState = UIStateType.TABLECURATION;
UIStateEvent uiStateEvent = new UIStateEvent(UIStateType.TABLECURATION);
@ -447,7 +447,7 @@ public class TabularDataController {
UIStateEvent uiStateEvent = new UIStateEvent(UIStateType.TR_CLOSE);
uiStateEvent.setTrId(trId);
trId = null;
//tableOpening = null;
// tableOpening = null;
uiState = UIStateType.TR_CLOSE;
Log.debug("fireEvent TR_CLOSE");
try {
@ -531,10 +531,10 @@ public class TabularDataController {
);
} else {
}
} else {
}
}
@ -582,57 +582,52 @@ public class TabularDataController {
}
}
protected void doDataViewClose(DataViewActiveEvent event) {
Log.debug("doDataViewClose: " + event);
DataView oldDataView = event.getOldDataView();
if (oldDataView instanceof TabularResourceDataView) {
closeAllTabularResource();
/*TabularResourceDataView tabularResourceDataView = (TabularResourceDataView) oldDataView;
Log.debug("TabularResourceDataView:" + tabularResourceDataView);
TDGWTServiceAsync.INSTANCE.closeTabularResource(
tabularResourceDataView.getTrId(), new AsyncCallback<Void>() {
@Override
public void onFailure(Throwable caught) {
if (caught instanceof TDGWTSessionExpiredException) {
eventBus.fireEvent(new SessionExpiredEvent(
SessionExpiredType.EXPIREDONSERVER));
} else {
Log.error("Error in set Active TR "
+ caught.getLocalizedMessage());
caught.printStackTrace();
UtilsGXT3.alert(
"Error",
"Error in set Active TR: "
+ caught.getLocalizedMessage());
}
}
@Override
public void onSuccess(Void result) {
Log.debug("Close Taular Resource");
}
}
);*/
/*
* TabularResourceDataView tabularResourceDataView =
* (TabularResourceDataView) oldDataView;
* Log.debug("TabularResourceDataView:" + tabularResourceDataView);
* TDGWTServiceAsync.INSTANCE.closeTabularResource(
* tabularResourceDataView.getTrId(), new AsyncCallback<Void>() {
*
* @Override public void onFailure(Throwable caught) {
*
* if (caught instanceof TDGWTSessionExpiredException) {
* eventBus.fireEvent(new SessionExpiredEvent(
* SessionExpiredType.EXPIREDONSERVER)); } else {
* Log.error("Error in set Active TR " +
* caught.getLocalizedMessage()); caught.printStackTrace();
* UtilsGXT3.alert( "Error", "Error in set Active TR: " +
* caught.getLocalizedMessage()); }
*
* }
*
* @Override public void onSuccess(Void result) {
* Log.debug("Close Taular Resource");
*
* } }
*
* );
*/
} else {
}
}
protected void requestCloseCurrent(){
DataViewRequestEvent dataViewRequestEvent=new DataViewRequestEvent();
protected void requestCloseCurrent() {
DataViewRequestEvent dataViewRequestEvent = new DataViewRequestEvent();
dataViewRequestEvent.setDataViewRequestType(DataViewRequestType.CLOSE);
dataViewRequestEvent.setDataView(new TabularResourceDataView(trId));
eventBus.fireEvent(dataViewRequestEvent);
}
//TODO
// TODO
protected void deleteTabularResource() {
final ConfirmMessageBox mb = new ConfirmMessageBox("Confirm",
@ -1361,11 +1356,23 @@ 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();
GWT.runAsync(new RunAsyncCallback() {
public void onSuccess() {
initTaskManager();
tdTaskMainWindow.setPosition(
(Window.getClientWidth() / 2) - 200,
(Window.getClientHeight() / 2) - 300);
tdTaskController.updateTasks(true);
tdTaskMainWindow.show();
}
public void onFailure(Throwable reason) {
asyncCodeLoadingFailed(reason);
}
});
}
protected void initTaskManager() {
@ -1380,59 +1387,107 @@ public class TabularDataController {
}
protected void openTemplateNew() {
TdTemplateController tdTemplateController = new TdTemplateController();
TdTemplateController.bindCommonBus(eventBus);
tdTemplateController.getWindowTemplatePanel().show();
GWT.runAsync(new RunAsyncCallback() {
public void onSuccess() {
TdTemplateController tdTemplateController = new TdTemplateController();
TdTemplateController.bindCommonBus(eventBus);
tdTemplateController.getWindowTemplatePanel().show();
}
public void onFailure(Throwable reason) {
asyncCodeLoadingFailed(reason);
}
});
}
protected void openTemplateDelete() {
TemplateDeleteDialog tdDialog = new TemplateDeleteDialog(eventBus);
tdDialog.show();
GWT.runAsync(new RunAsyncCallback() {
public void onSuccess() {
TemplateDeleteDialog tdDialog = new TemplateDeleteDialog(
eventBus);
tdDialog.show();
}
public void onFailure(Throwable reason) {
asyncCodeLoadingFailed(reason);
}
});
}
protected void openTemplateOpen() {
Log.debug("Template Open call");
TemplateOpenDialog tdDialog = new TemplateOpenDialog(eventBus);
tdDialog.show();
GWT.runAsync(new RunAsyncCallback() {
public void onSuccess() {
Log.debug("Template Open call");
TemplateOpenDialog tdDialog = new TemplateOpenDialog(eventBus);
tdDialog.show();
}
public void onFailure(Throwable reason) {
asyncCodeLoadingFailed(reason);
}
});
}
protected void openTemplateApply() {
GWT.runAsync(new RunAsyncCallback() {
public void onSuccess() {
Log.debug("Template Apply call");
if (trId != null) {
TemplateApplyDialog taDialog = new TemplateApplyDialog(
trId, eventBus);
taDialog.show();
} else {
Log.error("TRId is null");
UtilsGXT3.alert("Error",
"No current tabular resource present");
}
}
public void onFailure(Throwable reason) {
asyncCodeLoadingFailed(reason);
}
});
}
protected void openShareWindow() {
Log.debug("Open Share Window");
@SuppressWarnings("unused")
TRShare trShare = new TRShare(trId, eventBus);
GWT.runAsync(new RunAsyncCallback() {
public void onSuccess() {
Log.debug("Open Share Window");
@SuppressWarnings("unused")
TRShare trShare = new TRShare(trId, eventBus);
}
public void onFailure(Throwable reason) {
asyncCodeLoadingFailed(reason);
}
});
}
protected void callDiscard() {
HistoryDiscard historyDiscard = new HistoryDiscard(eventBus);
historyDiscard.discard();
}
protected void openStatistical() {
@SuppressWarnings("unused")
StatisticalWidget statisticalWidget= new StatisticalWidget(trId, eventBus);
}
protected void openTemplateApply() {
Log.debug("Template Apply call");
if (trId != null) {
TemplateApplyDialog taDialog = new TemplateApplyDialog(trId,
eventBus);
taDialog.show();
} else {
Log.error("TRId is null");
UtilsGXT3.alert("Error", "No current tabular resource present");
}
GWT.runAsync(new RunAsyncCallback() {
public void onSuccess() {
@SuppressWarnings("unused")
StatisticalWidget statisticalWidget = new StatisticalWidget(
trId, eventBus);
}
public void onFailure(Throwable reason) {
asyncCodeLoadingFailed(reason);
}
});
}
protected void openMultiColumnFilter() {
Log.debug("Request Open Multi Column Filter Dialog");
if (trId != null) {
@ -1682,7 +1737,6 @@ public class TabularDataController {
WidgetRequestEvent e = new WidgetRequestEvent(
WidgetRequestType.MONITORBACKGROUNDPANEL);
eventBus.fireEvent(e);
}
protected void doChangeTableRequestEventCommand(

4
src/main/java/org/gcube/portlets/user/td/client/ribbon/AnalyseToolBar.java
View File

@ -73,7 +73,7 @@ public class AnalyseToolBar {
tableGroup.setStyleName("ribbon");
tableGroup.setHeadingText("Table");
tableGroup.disable();
toolBar.add(tableGroup);
//toolBar.add(tableGroup);
FlexTable tableLayout = new FlexTable();
tableGroup.add(tableLayout);
@ -204,7 +204,7 @@ public class AnalyseToolBar {
columnGroup.setStyleName("ribbon");
columnGroup.setHeadingText("Column");
columnGroup.disable();
toolBar.add(columnGroup);
//toolBar.add(columnGroup);
FlexTable columnLayout = new FlexTable();
columnGroup.add(columnLayout);

6
src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
View File

@ -47,7 +47,7 @@
<inherits name='org.gcube.portlets.user.td.unionwizardwidget.UnionWizardTD' />
<inherits name='org.gcube.portlets.user.td.mapwidget.MapWidgetTD' />
<inherits name='org.gcube.portlets.user.td.statisticalwidget.StatisticalWidget' />
<inherits name='org.gwtopenmaps.openlayers.OpenLayers' />
<!-- <inherits name='org.gwtopenmaps.openlayers.OpenLayers' /> -->
@ -64,13 +64,13 @@
<!-- Specify the app entry point class. -->
<entry-point class='org.gcube.portlets.user.td.client.TabularDataPortlet' />
<!--
<!--
<set-property name="log_DivLogger" value="ENABLED" /> <set-property
name="log_ConsoleLogger" value="ENABLED" /> <set-property name="log_FirebugLogger"
value="ENABLED" /> <set-property name="log_GWTLogger" value="ENABLED" />
<set-property name="log_SystemLogger" value="ENABLED" /> -->
<set-property name="log_DivLogger" value="DISABLED" />
<set-property name="log_ConsoleLogger" value="DISABLED" />
<set-property name="log_FirebugLogger" value="DISABLED" />

51
src/main/webapp/WEB-INF/web.xml
View File

@ -122,14 +122,40 @@
<servlet-class>org.gcube.portlets.widgets.sessionchecker.server.SessionCheckerServiceImpl</servlet-class>
</servlet>
<!-- TD Logs -->
<!-- STATISTICAL -->
<servlet>
<servlet-name>StatisticalManagerAlgorithmsWidgetServlet</servlet-name>
<servlet-class>org.gcube.portlets.widgets.StatisticalManagerAlgorithmsWidget.server.StatisticalManagerWidgetServiceImpl</servlet-class>
</servlet>
<servlet>
<servlet-name>DownloadService</servlet-name>
<servlet-class>org.gcube.portlets.widgets.StatisticalManagerAlgorithmsWidget.server.DownloadServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>tdwService</servlet-name>
<servlet-class>org.gcube.portlets.user.tdw.server.TabularDataServiceImpl</servlet-class>
</servlet>
<servlet>
<servlet-name>tdwServlet</servlet-name>
<servlet-class>org.gcube.portlets.user.tdw.server.TabularDataServlet</servlet-class>
</servlet>
<!-- TD Logs -->
<servlet>
<servlet-name>TDLogsServlet</servlet-name>
<servlet-class>org.gcube.portlets.user.td.gwtservice.server.TDLogsServlet</servlet-class>
</servlet>
<!-- Servlets Mapping -->
<!-- JUnit -->
<servlet-mapping>
@ -237,6 +263,29 @@
<url-pattern>/tabulardataportlet/checksession</url-pattern>
</servlet-mapping>
<!-- STATISTICAL -->
<servlet-mapping>
<servlet-name>StatisticalManagerAlgorithmsWidgetServlet</servlet-name>
<url-pattern>/tabulardataportlet/statman</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>DownloadService</servlet-name>
<url-pattern>/tabulardataportlet/DownloadService</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>tdwService</servlet-name>
<url-pattern>/tabulardataportlet/tdw</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>tdwServlet</servlet-name>
<url-pattern>/tabulardataportlet/tdwdata</url-pattern>
</servlet-mapping>
<!-- TD logs -->
<servlet-mapping>
<servlet-name>TDLogsServlet</servlet-name>