mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-13 20:15:22 +02:00
Code Issues Wiki Activity

[250417] Restore from memento flag set to false during restore on startup

Browse source
This commit is contained in:
David McKnight 2009-07-31 20:31:48 +00:00
parent a6f6a3ed4e
commit cebe6fc075
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java
View file

@ -37,6 +37,7 @@
* Kevin Doyle (IBM) - [242431] Register a new unique context menu id, so contributions can be made to all our views * Kevin Doyle (IBM) - [242431] Register a new unique context menu id, so contributions can be made to all our views
* Li Ding (IBM) - [256135] Subsystem not restored in system view tree if subsystem configuration does not support filter * Li Ding (IBM) - [256135] Subsystem not restored in system view tree if subsystem configuration does not support filter
* David McKnight (IBM) - [257721] Doubleclick doing special handling and expanding * David McKnight (IBM) - [257721] Doubleclick doing special handling and expanding
* David McKnight (IBM) - [250417] Restore from memento flag set to false during restore on startup
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
@ -1506,14 +1507,12 @@ public class SystemViewPart
protected class RestoreRemoteObjects extends Job protected class RestoreRemoteObjects extends Job
{ {
private Vector _remoteObjectsToRestore; private Vector _remoteObjectsToRestore;
private List _cacheSubSystemList;
private Vector _remoteObjectsToSelect; private Vector _remoteObjectsToSelect;
public RestoreRemoteObjects(Vector remoteObjects, List cacheSubSystemList, Vector remoteObjectsToSelect) public RestoreRemoteObjects(Vector remoteObjects, Vector remoteObjectsToSelect)
{ {
super("Restore Remote Objects"); //$NON-NLS-1$ super("Restore Remote Objects"); //$NON-NLS-1$
_remoteObjectsToRestore = remoteObjects; _remoteObjectsToRestore = remoteObjects;
_cacheSubSystemList = cacheSubSystemList;
_remoteObjectsToSelect = remoteObjectsToSelect; _remoteObjectsToSelect = remoteObjectsToSelect;
} }
@ -1548,6 +1547,8 @@ public class SystemViewPart
protected IStatus doRestore(IProgressMonitor monitor) protected IStatus doRestore(IProgressMonitor monitor)
{ {
boolean restoreFromCache = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.RESTORE_STATE_FROM_CACHE);
for (int i = 0; i < _remoteObjectsToRestore.size(); i++){ for (int i = 0; i < _remoteObjectsToRestore.size(); i++){
if (monitor.isCanceled()){ if (monitor.isCanceled()){
@ -1563,8 +1564,7 @@ public class SystemViewPart
// yantzi: artemis 6.0: notify subsystems that this is a restore from memento so they // yantzi: artemis 6.0: notify subsystems that this is a restore from memento so they
// can optionally use the cache if desired // can optionally use the cache if desired
if (ss != null && ss.supportsCaching()) if (ss != null && restoreFromCache && ss.supportsCaching()){
{
ss.getCacheManager().setRestoreFromMemento(true); ss.getCacheManager().setRestoreFromMemento(true);
} }
@ -1592,17 +1592,15 @@ public class SystemViewPart
} }
} }
catch (Exception e) catch (Exception e){
{
// unexpected // unexpected
} }
// yantzi: artemis 6.0: reset restore from memento flag
if (ss != null && ss.supportsCaching())
{
ss.getCacheManager().setRestoreFromMemento(false);
}
} }
// yantzi: artemis 6.0: reset restore from memento flag
if (ss != null && restoreFromCache && ss.supportsCaching()){
ss.getCacheManager().setRestoreFromMemento(false);
}
} }
else if (object instanceof ISystemFilterReference) else if (object instanceof ISystemFilterReference)
{ {
@ -1610,6 +1608,11 @@ public class SystemViewPart
ISystemFilterReference fref = (ISystemFilterReference)object; ISystemFilterReference fref = (ISystemFilterReference)object;
ISubSystem ss = fref.getSubSystem(); ISubSystem ss = fref.getSubSystem();
// yantzi: artemis 6.0: notify subsystems that this is a restore from memento so they
// can optionally use the cache if desired
if (ss != null && restoreFromCache && ss.supportsCaching()){
ss.getCacheManager().setRestoreFromMemento(true);
}
boolean isRestoringCache = ss.getCacheManager() != null && ss.getCacheManager().isRestoreFromMemento(); boolean isRestoringCache = ss.getCacheManager() != null && ss.getCacheManager().isRestoreFromMemento();
if (!ss.isOffline()){ if (!ss.isOffline()){
@ -1637,17 +1640,14 @@ public class SystemViewPart
Display.getDefault().asyncExec(showRunnable); Display.getDefault().asyncExec(showRunnable);
} }
} }
// yantzi: artemis 6.0: reset restore from memento flag
if (ss != null && restoreFromCache && ss.supportsCaching()){
ss.getCacheManager().setRestoreFromMemento(false);
}
} }
} }
boolean restoreFromCache = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.RESTORE_STATE_FROM_CACHE);
// yantzi: artemis 6.0, restore memento flag for affected subsystems
if (restoreFromCache)
{
for (int i = 0; i < _cacheSubSystemList.size(); i++)
{
((ISubSystem) _cacheSubSystemList.get(i)).getCacheManager().setRestoreFromMemento(false);
}
}
return Status.OK_STATUS; return Status.OK_STATUS;
} }
@ -1833,7 +1833,7 @@ public class SystemViewPart
if (remoteElementsToRestore.size() > 0) if (remoteElementsToRestore.size() > 0)
{ {
RestoreRemoteObjects restoreRemoteJob = new RestoreRemoteObjects(remoteElementsToRestore, cacheSubSystemList, remoteElementsToSelect); RestoreRemoteObjects restoreRemoteJob = new RestoreRemoteObjects(remoteElementsToRestore, remoteElementsToSelect);
restoreRemoteJob.schedule(); restoreRemoteJob.schedule();
} }