| commit | c445d63f8ed37612bc6134aebe55b16454f17fea | [log] [tgz] |
|---|---|---|
| author | Laurent Fasani <laurent.fasani@obeo.fr> | Thu Feb 25 11:45:52 2021 +0100 |
| committer | Laurent Fasani <laurent.fasani@obeo.fr> | Thu Feb 25 16:23:20 2021 +0100 |
| tree | 09a1b731d60aa9feb71667eef7de13210603f2f7 | |
| parent | d8fba946e44cf1aab9a593e7b349140d2ca3b9b1 [diff] |
[570355] Fix tests Change-Id: I8708b7cc44ee71be0b4b87c29150aaf784cd964c Signed-off-by: Laurent Fasani <laurent.fasani@obeo.fr>
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/DDiagramEditorImpl.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/DDiagramEditorImpl.java index 3a13add..3440cde 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/DDiagramEditorImpl.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/DDiagramEditorImpl.java
@@ -1667,7 +1667,7 @@ /* * Refresh diagram if needed. Must be done before that */ - if (Session.of(getRepresentation()).get().getSiriusPreferences().isRefreshOnRepresentationOpening()) { + if (getSession() != null && session.getSiriusPreferences().isRefreshOnRepresentationOpening()) { launchRefresh(true); }
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/ui/RefreshHelper.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/ui/RefreshHelper.java index f9daf12..a14e0db 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/ui/RefreshHelper.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/ui/RefreshHelper.java
@@ -126,7 +126,7 @@ session = new EObjectQuery(optionalDRepresentation.get()).getSession(); } } - if (session != null && session.getSiriusPreferences().isAutoRefresh()) { + if (session != null && !session.getSiriusPreferences().isAutoRefresh()) { if (!optionalDRepresentation.some()) { optionalDRepresentation = new EObjectQuery(notifier).getRepresentation(); }