Attachment #214914 for bug #377501

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




import java.util.Map.Entry;

import org.eclipse.draw2d.Connection;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Polyline;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;

import org.eclipse.gmf.runtime.notation.Shape;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

		}
	}

	public EditPart getTargetEditPart(Request request) {
		if (REQ_CONNECTION_START.equals(request.getType())
				|| REQ_CONNECTION_END.equals(request.getType())
				|| REQ_RECONNECT_SOURCE.equals(request.getType())
				|| REQ_RECONNECT_TARGET.equals(request.getType())){
			
			EditPart host = getHost();
			if((host instanceof InteractionEditPart) && (request instanceof CreateConnectionRequest) ){
				InteractionEditPart interactionPart = (InteractionEditPart)host;
				CreateConnectionRequest req = (CreateConnectionRequest)request;
				IFigure figure = interactionPart.getFigure();
				Point location = req.getLocation().getCopy();
				figure.translateToRelative(location);
				
				// if mouse location is far from border, do not handle connection event 
				Rectangle innerRetangle = figure.getBounds().getCopy().shrink(20, 20);
				if(innerRetangle.contains(location)){
					return null;
				}
			}
			
			return host;
		}
		return null;
	}

}

Lines 24-29 Link Here

(-)src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionEditPart.java (-4 / +48 lines)
24	import org.eclipse.draw2d.XYAnchor;	24	import org.eclipse.draw2d.XYAnchor;
25	import org.eclipse.draw2d.geometry.Dimension;	25	import org.eclipse.draw2d.geometry.Dimension;
26	import org.eclipse.draw2d.geometry.Point;	26	import org.eclipse.draw2d.geometry.Point;
		27	import org.eclipse.draw2d.geometry.PointList;
		28	import org.eclipse.draw2d.geometry.PrecisionPoint;
27	import org.eclipse.draw2d.geometry.Rectangle;	29	import org.eclipse.draw2d.geometry.Rectangle;
28	import org.eclipse.emf.common.notify.Notification;	30	import org.eclipse.emf.common.notify.Notification;
29	import org.eclipse.emf.common.notify.Notifier;	31	import org.eclipse.emf.common.notify.Notifier;
Lines 263-268 Link Here
263	}	265	}
264	return getContentPane();	266	return getContentPane();
265	}	267	}
		268
		269	static class SlidableAnchorEx extends SlidableAnchor{
		270	SlidableAnchorEx(IFigure f, PrecisionPoint p) {
		271	super(f,p);
		272	}
		273
		274	protected Point getLocation(Point ownReference, Point foreignReference) {
		275	PointList intersections = getIntersectionPoints(ownReference, foreignReference);
		276	if (intersections!=null && intersections.size()!=0) {
		277	int size = intersections.size();
		278	double dist = foreignReference.getDistance(ownReference);
		279	for(int i = 0; i < size; i ++){
		280	Point loc = intersections.getPoint(i);
		281	if(isInOrder(foreignReference,ownReference,dist, loc)){
		282	return loc;
		283	}
		284	}
		285	return intersections.getFirstPoint();
		286	}
		287	return null;
		288	}
		289
		290	private boolean isInOrder(Point start, Point end, double dist, Point loc) {
		291	double total = loc.getDistance(start);
		292	double dist2 = loc.getDistance(end);
		293	if(total < dist \|\| total < dist2)
		294	return false;
		295
		296	if(Math.abs(total - dist - dist2) < 0.01)
		297	return true;
		298
		299	return false;
		300	}
		301	}
266		302
267	/**	303	/**
268	* @generated	304	* @generated
Lines 272-278 Link Here
272	IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();	308	IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
273	String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);	309	String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);
274	String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);	310	String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);
275	DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));	311	DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight)){
		312
		313	protected ConnectionAnchor createAnchor(PrecisionPoint p) {
		314	if (p==null)
		315	// If the old terminal for the connection anchor cannot be resolved (by SlidableAnchor) a null
		316	// PrecisionPoint will passed in - this is handled here
		317	return createDefaultAnchor();
		318	return new SlidableAnchorEx(this, p);
		319	}
		320	};
276		321
277	return result;	322	return result;
278	}	323	}
Lines 1263-1269 Link Here
1263	// return targetAnchor;	1308	// return targetAnchor;
1264	return super.getTargetConnectionAnchor(request);	1309	return super.getTargetConnectionAnchor(request);
1265	}	1310	}
1266		1311
1267	/**	1312	/**
1268	* Handle lost message	1313	* Handle lost message
1269	*/	1314	*/
Lines 1273-1280 Link Here
1273	Point referencePoint = targetConnectionAnchor.getReferencePoint();	1318	Point referencePoint = targetConnectionAnchor.getReferencePoint();
1274	if(connEditPart instanceof Message6EditPart && referencePoint.x != 0 && referencePoint.y != 0) {	1319	if(connEditPart instanceof Message6EditPart && referencePoint.x != 0 && referencePoint.y != 0) {
1275	targetConnectionAnchor = new XYAnchor(referencePoint);	1320	targetConnectionAnchor = new XYAnchor(referencePoint);
1276	}	1321	}
1277
1278	return targetConnectionAnchor;	1322	return targetConnectionAnchor;
1279	}	1323	}
1280		1324




import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.Request;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
import org.eclipse.gef.handles.MoveHandle;
import org.eclipse.gef.requests.CreateConnectionRequest;
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ContainerNodeEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableLabelEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy;

		
		//fix https://bugs.eclipse.org/bugs/show_bug.cgi?id=364688
		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
		
		// do not handle connection event
		installEditPolicy(
			EditPolicy.GRAPHICAL_NODE_ROLE,
			new ContainerNodeEditPolicy(){
				
				protected Command getConnectionAndEndCommands(
					CreateConnectionRequest request) {
					return UnexecutableCommand.INSTANCE;
				}
			});
	}

	private EditPolicy createLayoutEditPolicy() {

Return to bug 377501

Lines 20-25 Link Here

(-)custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/SequenceGraphicalNodeEditPolicy.java (-1 / +27 lines)
20	import java.util.Map.Entry;	20	import java.util.Map.Entry;
21		21
22	import org.eclipse.draw2d.Connection;	22	import org.eclipse.draw2d.Connection;
		23	import org.eclipse.draw2d.IFigure;
23	import org.eclipse.draw2d.Polyline;	24	import org.eclipse.draw2d.Polyline;
24	import org.eclipse.draw2d.geometry.Point;	25	import org.eclipse.draw2d.geometry.Point;
25	import org.eclipse.draw2d.geometry.Rectangle;	26	import org.eclipse.draw2d.geometry.Rectangle;
Lines 46-51 Link Here
46	import org.eclipse.gmf.runtime.notation.Shape;	47	import org.eclipse.gmf.runtime.notation.Shape;
47	import org.eclipse.jface.viewers.ILabelProvider;	48	import org.eclipse.jface.viewers.ILabelProvider;
48	import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart;	49	import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart;
		50	import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart;
49	import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;	51	import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;
50	import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;	52	import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;
51	import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;	53	import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;
Lines 437-442 Link Here
437	}	439	}
438	}	440	}
439		441
440		442	public EditPart getTargetEditPart(Request request) {
		443	if (REQ_CONNECTION_START.equals(request.getType())
		444	\|\| REQ_CONNECTION_END.equals(request.getType())
		445	\|\| REQ_RECONNECT_SOURCE.equals(request.getType())
		446	\|\| REQ_RECONNECT_TARGET.equals(request.getType())){
		447
		448	EditPart host = getHost();
		449	if((host instanceof InteractionEditPart) && (request instanceof CreateConnectionRequest) ){
		450	InteractionEditPart interactionPart = (InteractionEditPart)host;
		451	CreateConnectionRequest req = (CreateConnectionRequest)request;
		452	IFigure figure = interactionPart.getFigure();
		453	Point location = req.getLocation().getCopy();
		454	figure.translateToRelative(location);
		455
		456	// if mouse location is far from border, do not handle connection event
		457	Rectangle innerRetangle = figure.getBounds().getCopy().shrink(20, 20);
		458	if(innerRetangle.contains(location)){
		459	return null;
		460	}
		461	}
		462
		463	return host;
		464	}
		465	return null;
		466	}
441		467
442	}	468	}

Lines 23-31 Link Here

(-)src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/PackageEditPart.java (+14 lines)
23	import org.eclipse.gef.GraphicalEditPart;	23	import org.eclipse.gef.GraphicalEditPart;
24	import org.eclipse.gef.Request;	24	import org.eclipse.gef.Request;
25	import org.eclipse.gef.commands.Command;	25	import org.eclipse.gef.commands.Command;
		26	import org.eclipse.gef.commands.UnexecutableCommand;
26	import org.eclipse.gef.editpolicies.NonResizableEditPolicy;	27	import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
27	import org.eclipse.gef.handles.MoveHandle;	28	import org.eclipse.gef.handles.MoveHandle;
		29	import org.eclipse.gef.requests.CreateConnectionRequest;
28	import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;	30	import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
		31	import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ContainerNodeEditPolicy;
29	import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;	32	import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
30	import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableLabelEditPolicy;	33	import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableLabelEditPolicy;
31	import org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy;	34	import org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy;
Lines 82-87 Link Here
82		85
83	//fix https://bugs.eclipse.org/bugs/show_bug.cgi?id=364688	86	//fix https://bugs.eclipse.org/bugs/show_bug.cgi?id=364688
84	installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());	87	installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
		88
		89	// do not handle connection event
		90	installEditPolicy(
		91	EditPolicy.GRAPHICAL_NODE_ROLE,
		92	new ContainerNodeEditPolicy(){
		93
		94	protected Command getConnectionAndEndCommands(
		95	CreateConnectionRequest request) {
		96	return UnexecutableCommand.INSTANCE;
		97	}
		98	});
85	}	99	}
86		100
87	private EditPolicy createLayoutEditPolicy() {	101	private EditPolicy createLayoutEditPolicy() {