gCubeSystem
/
ws-thredds-sync-widget
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed cancel scheduler and remove monitor 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/widgets/ws-thredds-sync-widget@164698 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2018-03-05 09:59:30 +00:00
parent 9fb50c7dba
commit 46549ec577
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/gcube/portlets/widgets/wsthreddssync/client/WsThreddsWidget.java
View File

@ -96,9 +96,7 @@ public class WsThreddsWidget {
viewManager.showMonitorSyncToFolder(folder); viewManager.showMonitorSyncToFolder(folder);
return; return;
} }
final Modal box = new Modal(true); final Modal box = new Modal(true);
box.setTitle("Checking configurations..."); box.setTitle("Checking configurations...");
LoaderIcon loader = new LoaderIcon("Checking folder configurations..."); LoaderIcon loader = new LoaderIcon("Checking folder configurations...");

39
src/main/java/org/gcube/portlets/widgets/wsthreddssync/client/view/WsThreddsWidgetViewManager.java
View File

@ -56,15 +56,11 @@ public class WsThreddsWidgetViewManager {
*/ */
public void cancelMonitor(WsFolder folder) { public void cancelMonitor(WsFolder folder) {
try { try {
MonitorFolderSyncStatusView monitorView = getMonitor(folder); MonitorFolderSyncStatusView monitor = cancelScheduler(folder);
if(monitorView.getSchedulerTime()!=null) { if(monitor!=null)
GWT.log("Removed sheduler time on folder: "+folder.getFolderId()); mapMonitor.remove(folder.getFolderId());
monitorView.getSchedulerTime().cancel();
}
GWT.log("Removed monitor on folder: "+folder.getFolderId());
mapMonitor.remove(folder.getFolderId());
}catch (Exception e) { }catch (Exception e) {
GWT.log("Error on removing map monitor for id: "+folder.getFolderId());; GWT.log("Error on removing map monitor for id: "+folder.getFolderId());
} }
} }
@ -96,6 +92,24 @@ public class WsThreddsWidgetViewManager {
} }
/**
* Cancel scheduler.
*
* @param folder the folder
* @return
*/
private MonitorFolderSyncStatusView cancelScheduler(final WsFolder folder) {
MonitorFolderSyncStatusView monitor = getMonitor(folder);
if(monitor.getSchedulerTime()!=null) {
GWT.log("Cancelling scheduler time on folder: "+folder.getFolderId());
monitor.getSchedulerTime().cancel();
}
return monitor;
}
/** /**
* Show monitor sync to folder. * Show monitor sync to folder.
* *
@ -116,12 +130,12 @@ public class WsThreddsWidgetViewManager {
@Override @Override
public void closeHandler() { public void closeHandler() {
cancelMonitor(folder); //cancelScheduler(folder);
box.hide(); box.hide();
} }
}; };
if(monitorView==null) { if(monitorView==null) {
monitorView = new MonitorFolderSyncStatusView() { monitorView = new MonitorFolderSyncStatusView() {
@ -138,10 +152,11 @@ public class WsThreddsWidgetViewManager {
panelView.setError(visible, error); panelView.setError(visible, error);
} }
}; };
} }
//Removing old monitor //Removing old monitor
cancelMonitor(folder); //cancelMonitor(folder);
//Creating new one //Creating new one
final MonitorFolderSyncStatusView currentMonitor = monitorView; final MonitorFolderSyncStatusView currentMonitor = monitorView;
@ -178,7 +193,7 @@ public class WsThreddsWidgetViewManager {
schedulingTimer.scheduleRepeating(2000); schedulingTimer.scheduleRepeating(2000);
currentMonitor.setScheduler(schedulingTimer); currentMonitor.setScheduler(schedulingTimer);
saveMonitor(folder, currentMonitor); saveMonitor(folder, currentMonitor);
panelView.addViewAsWidget(monitorView); panelView.addViewAsWidget(monitorView);
box.add(panelView); box.add(panelView);
box.show(); box.show();