[546250] Pull up the refreshVisibility() method
The method refreshVisibility() has been pulled up to
AbstractDiagramEdgeEditPart to have the same behavior on
BracketEdgeEditPart.
Bug: 546250
Change-Id: I704a1f4c12ee2c519381c5f5271bc903086328eb
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramEdgeEditPart.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramEdgeEditPart.java
index c7cc9ad..d81a405 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramEdgeEditPart.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramEdgeEditPart.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2018 THALES GLOBAL SERVICES and others.
+ * Copyright (c) 2008, 2019 THALES GLOBAL SERVICES and others.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -270,6 +270,27 @@
}
@Override
+ protected void refreshVisibility() {
+ boolean gmfModelVisibility = ((View) getModel()).isVisible();
+ if (gmfModelVisibility) {
+ // By default, only the GMF model visibility status is considered. But if the source or the target is
+ // contained in a collapsed compartment the edge must not be visible (like in
+ // org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart.ConnectionRefreshMgr.refreshConnections(ShapeCompartmentEditPart)).
+ IGraphicalEditPart source = (IGraphicalEditPart) this.getSource();
+ IGraphicalEditPart target = (IGraphicalEditPart) this.getTarget();
+ if (source == null || target == null) {
+ setVisibility(false);
+ } else if (!source.getFigure().isShowing() || !target.getFigure().isShowing()) {
+ setVisibility(false);
+ } else {
+ setVisibility(true);
+ }
+ } else {
+ setVisibility(false);
+ }
+ }
+
+ @Override
protected void refreshFont() {
super.refreshFont();
DiagramEdgeEditPartOperation.refreshFont(this);
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/DEdgeEditPart.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/DEdgeEditPart.java
index 0b1d99f..df9c1ee 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/DEdgeEditPart.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/DEdgeEditPart.java
@@ -18,7 +18,6 @@
import org.eclipse.gef.EditPolicy;
import org.eclipse.gef.Request;
import org.eclipse.gef.RootEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ConnectionBendpointEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.internal.editpolicies.ConnectionLineSegEditPolicy;
@@ -163,25 +162,4 @@
public DragTracker getDragTracker(Request req) {
return new SiriusSelectConnectionEditPartTracker(this);
}
-
- @Override
- protected void refreshVisibility() {
- boolean gmfModelVisibility = ((View) getModel()).isVisible();
- if (gmfModelVisibility) {
- // By default, only the GMF model visibility status is considered. But if the source or the target is
- // contained in a collapsed compartment the edge must not be visible (like in
- // org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart.ConnectionRefreshMgr.refreshConnections(ShapeCompartmentEditPart)).
- IGraphicalEditPart source = (IGraphicalEditPart) this.getSource();
- IGraphicalEditPart target = (IGraphicalEditPart) this.getTarget();
- if (source == null || target == null) {
- setVisibility(false);
- } else if (!source.getFigure().isShowing() || !target.getFigure().isShowing()) {
- setVisibility(false);
- } else {
- setVisibility(true);
- }
- } else {
- setVisibility(false);
- }
- }
}
