[567517] Refactor CacheHelper

- Identify structural and range dependant cache.
- Clear range dependant caches as soon as a RangeSetter.setVerticalRange
is called.
- Rename the cache activator and tester methods

Bug: 567517
Change-Id: I2a854fda59e7816fda4227ebd076e7fb97822605
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>

1 files changed, 6 insertions, 1 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/refresh/RefreshLayoutCommand.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/refresh/RefreshLayoutCommand.java
index c323f0466a..26179a39ac 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/refresh/RefreshLayoutCommand.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/refresh/RefreshLayoutCommand.java
@@ -77,7 +77,9 @@ public class RefreshLayoutCommand extends RecordingCommand {
         IPermissionAuthority permissionAuthority = PermissionAuthorityRegistry.getDefault().getPermissionAuthority(sequenceDDiagram);
         if (permissionAuthority != null && permissionAuthority.canEditInstance(sequenceDDiagram)) {
             sequenceDiagram.useCache(true);
-            CacheHelper.initRefreshLayoutCaches();
+            CacheHelper.clearCaches();
+            CacheHelper.setStructuralCacheEnabled(true);
+            CacheHelper.setVerticalRangeCacheEnabled(false);
             try {
                 /*
                  * Everything has been committed, so we should be in a stable state where it is safe to refresh both
@@ -123,6 +125,9 @@ public class RefreshLayoutCommand extends RecordingCommand {
             } finally {
                 sequenceDiagram.useCache(false);
                 sequenceDiagram.clearAllCaches();
+
+                CacheHelper.setStructuralCacheEnabled(false);
+                CacheHelper.setVerticalRangeCacheEnabled(false);
                 CacheHelper.clearCaches();
             }
         }