[news.eclipse.modeling.gmf] generating problem after upgrading to GMF2.0

[Sascha Hänsch <sh@xxxxxxxxx>]

Hi friends,

After upgrading to 2.0M4 we have some merging problems concerning 
protected methods by "@generated NOT".

If we change the code of a method and mark it by "@generated NOT", we 
got a second method with the same name after the next generation like 
the following example

	/**
	 * Creates figure for this edit part.
	 *
	 * Body of this method does not depend on settings in
	 *	generation model
	 * so you may safely remove <i>generated</i> tag and modify it.
	 *
	 * @generated NOT
	 */
	protected NodeFigure createMainFigure() {
		NodeFigure figure = createNodePlate();
		figure.setLayoutManager(new StackLayout());
		IFigure shape = createNodeShape();
		figure.add(shape);
		shape.setBackgroundColor(ColorConstants.lightGreen);
		contentPane = setupContentPane(shape);
		return figure;
	}


	/**
	 * Creates figure for this edit part.
	 *
	 * Body of this method does not depend on settings in
	 *	generation model
	 * so you may safely remove <i>generated</i> tag and modify it.
	 *
	 * @generated
	 */
	protected NodeFigure createMainFigure() {
		NodeFigure figure = createNodePlate();
		figure.setLayoutManager(new StackLayout());
		IFigure shape = createNodeShape();
		figure.add(shape);
		contentPane = setupContentPane(shape);
		return figure;
	}

Any ideas how we can fix this problem ?

thanks and regards
Sascha