Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpguilet2016-09-23 14:03:24 +0000
committerMaxime Porhel2017-02-17 08:20:14 +0000
commit6eaadda344fb5db22f20c0b5e0599b540155add6 (patch)
tree8f1b62f5a8fc1fcab25961808720f987b753f377
parent07aac7a58b674bc50721c574af2e63ecc1a56c69 (diff)
downloadorg.eclipse.sirius-6eaadda344fb5db22f20c0b5e0599b540155add6.tar.gz
org.eclipse.sirius-6eaadda344fb5db22f20c0b5e0599b540155add6.tar.xz
org.eclipse.sirius-6eaadda344fb5db22f20c0b5e0599b540155add6.zip
[499895] Make DASessionHelper.getDView accept Viewpoints from registry
The test with EqualityHelper to compare Viewpoints is done in several place like Viewpoint Selector, DAnalysisSessionImpl.findViewForRepresentation, LayerHelper.getParentLayer, ... Bug: 499895 Change-Id: I4bfda8689a2ae8d2b6800a051dfe8d47cd9c306d Signed-off-by: pguilet <pierre.guilet@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/danalysis/DAnalysisSessionHelper.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/danalysis/DAnalysisSessionHelper.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/danalysis/DAnalysisSessionHelper.java
index b2504e2d8b..05e627e9e8 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/danalysis/DAnalysisSessionHelper.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/danalysis/DAnalysisSessionHelper.java
@@ -27,6 +27,7 @@ import org.eclipse.sirius.business.api.query.URIQuery;
import org.eclipse.sirius.business.api.query.ViewpointQuery;
import org.eclipse.sirius.business.api.resource.ResourceDescriptor;
import org.eclipse.sirius.business.internal.movida.ViewpointSelection;
+import org.eclipse.sirius.common.tools.api.util.EqualityHelper;
import org.eclipse.sirius.ext.base.Option;
import org.eclipse.sirius.viewpoint.DAnalysis;
import org.eclipse.sirius.viewpoint.DRepresentation;
@@ -448,7 +449,7 @@ public final class DAnalysisSessionHelper {
private static DView getDView(DAnalysis analysis, Viewpoint viewpoint) {
DView result = null;
for (final DView view : analysis.getOwnedViews()) {
- if (view != null && viewpoint == view.getViewpoint()) {
+ if (viewpoint != null && EqualityHelper.areEquals(viewpoint, view.getViewpoint())) {
result = view;
break;
}

Back to the top