Attachment #47317 for bug #145467




import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Cursor;


/**

		super.paintFigure(graphics);
		graphics.popState();
	}
	
	/**
	* Currently we cannot create bendpoints with avoid obstructions 
	* routing style turned on. Hence we need to define a special cursor
	* to give user feedback about the disabled bendpoint editing 
	*/
	static private final Cursor NO_COMMAND_SPECIAL_CURSOR = new Cursor(null, SWT.CURSOR_ARROW);

	/**
	 * Overriden to display special cursor when needed. Fix for bug #145467 
	 */
	public Cursor getCursor() {
		if (isAvoidObstacleRouting())
			return NO_COMMAND_SPECIAL_CURSOR;
		return super.getCursor();
	}
	
}


Lines 1173-1178 Link Here

(-)src/org/eclipse/gmf/runtime/diagram/ui/editparts/ConnectionEditPart.java (+7 lines)
1173	boolean avoidObstruction = style.isAvoidObstructions();	1173	boolean avoidObstruction = style.isAvoidObstructions();
1174		1174
1175	poly.setRoutingStyles(closestDistance, avoidObstruction);	1175	poly.setRoutingStyles(closestDistance, avoidObstruction);
		1176
		1177	if (avoidObstruction)
		1178	installEditPolicy(EditPolicy.CONNECTION_BENDPOINTS_ROLE,null);
		1179	else
		1180	installEditPolicy(EditPolicy.CONNECTION_BENDPOINTS_ROLE,
		1181	new ConnectionBendpointEditPolicy());
		1182
1176	}	1183	}
1177	}	1184	}
1178		1185

Return to bug 145467

Lines 40-45 Link Here

(-)src/org/eclipse/gmf/runtime/draw2d/ui/figures/PolylineConnectionEx.java (+18 lines)
40	import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;	40	import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
41	import org.eclipse.swt.SWT;	41	import org.eclipse.swt.SWT;
42	import org.eclipse.swt.graphics.Color;	42	import org.eclipse.swt.graphics.Color;
		43	import org.eclipse.swt.graphics.Cursor;
43		44
44		45
45	/**	46	/**
Lines 1237-1241 Link Here
1237	super.paintFigure(graphics);	1238	super.paintFigure(graphics);
1238	graphics.popState();	1239	graphics.popState();
1239	}	1240	}
		1241
		1242	/**
		1243	* Currently we cannot create bendpoints with avoid obstructions
		1244	* routing style turned on. Hence we need to define a special cursor
		1245	* to give user feedback about the disabled bendpoint editing
		1246	*/
		1247	static private final Cursor NO_COMMAND_SPECIAL_CURSOR = new Cursor(null, SWT.CURSOR_ARROW);
		1248
		1249	/**
		1250	* Overriden to display special cursor when needed. Fix for bug #145467
		1251	*/
		1252	public Cursor getCursor() {
		1253	if (isAvoidObstacleRouting())
		1254	return NO_COMMAND_SPECIAL_CURSOR;
		1255	return super.getCursor();
		1256	}
		1257
1240	}	1258	}
1241		1259