### Eclipse Workspace Patch 1.0
#P org.eclipse.gmf.graphdef
Index: src/org/eclipse/gmf/gmfgraph/GMFGraphFactory.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/GMFGraphFactory.java,v
retrieving revision 1.4
diff -u -r1.4 GMFGraphFactory.java
--- src/org/eclipse/gmf/gmfgraph/GMFGraphFactory.java	14 Feb 2006 10:11:40 -0000	1.4
+++ src/org/eclipse/gmf/gmfgraph/GMFGraphFactory.java	15 Feb 2006 13:40:54 -0000
@@ -386,6 +386,42 @@
 	CustomAttribute createCustomAttribute();
 
 	/**
+	 * Returns a new object of class '<em>Flow Layout</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Flow Layout</em>'.
+	 * @generated
+	 */
+	FlowLayout createFlowLayout();
+
+	/**
+	 * Returns a new object of class '<em>XY Layout</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>XY Layout</em>'.
+	 * @generated
+	 */
+	XYLayout createXYLayout();
+
+	/**
+	 * Returns a new object of class '<em>XY Layout Data</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>XY Layout Data</em>'.
+	 * @generated
+	 */
+	XYLayoutData createXYLayoutData();
+
+	/**
+	 * Returns a new object of class '<em>Stack Layout</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Stack Layout</em>'.
+	 * @generated
+	 */
+	StackLayout createStackLayout();
+
+	/**
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
Index: src/org/eclipse/gmf/gmfgraph/Layoutable.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/Layoutable.java,v
retrieving revision 1.1
diff -u -r1.1 Layoutable.java
--- src/org/eclipse/gmf/gmfgraph/Layoutable.java	13 Feb 2006 17:36:31 -0000	1.1
+++ src/org/eclipse/gmf/gmfgraph/Layoutable.java	15 Feb 2006 13:40:56 -0000
@@ -28,7 +28,6 @@
 public interface Layoutable extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Layout Data</b></em>' containment reference.
-	 * The default value is <code>""</code>.
 	 * It is bidirectional and its opposite is '{@link org.eclipse.gmf.gmfgraph.LayoutData#getOwner <em>Owner</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
Index: src/org/eclipse/gmf/gmfgraph/GMFGraphPackage.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/GMFGraphPackage.java,v
retrieving revision 1.7
diff -u -r1.7 GMFGraphPackage.java
--- src/org/eclipse/gmf/gmfgraph/GMFGraphPackage.java	14 Feb 2006 10:11:40 -0000	1.7
+++ src/org/eclipse/gmf/gmfgraph/GMFGraphPackage.java	15 Feb 2006 13:40:56 -0000
@@ -4291,7 +4291,7 @@
 	 * @see org.eclipse.gmf.gmfgraph.impl.GMFGraphPackageImpl#getFontStyle()
 	 * @generated
 	 */
-	int FONT_STYLE = 56;
+	int FONT_STYLE = 60;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.gmf.gmfgraph.impl.PointImpl <em>Point</em>}' class.
@@ -5022,6 +5022,172 @@
 	int CUSTOM_ATTRIBUTE_FEATURE_COUNT = 4;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.gmf.gmfgraph.impl.FlowLayoutImpl <em>Flow Layout</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.gmf.gmfgraph.impl.FlowLayoutImpl
+	 * @see org.eclipse.gmf.gmfgraph.impl.GMFGraphPackageImpl#getFlowLayout()
+	 * @generated
+	 */
+	int FLOW_LAYOUT = 55;
+
+	/**
+	 * The feature id for the '<em><b>Vertical</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_LAYOUT__VERTICAL = LAYOUT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Match Minor Size</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_LAYOUT__MATCH_MINOR_SIZE = LAYOUT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Force Single Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_LAYOUT__FORCE_SINGLE_LINE = LAYOUT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Major Alignment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_LAYOUT__MAJOR_ALIGNMENT = LAYOUT_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Minor Alignment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_LAYOUT__MINOR_ALIGNMENT = LAYOUT_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Major Spacing</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_LAYOUT__MAJOR_SPACING = LAYOUT_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Minor Spacing</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_LAYOUT__MINOR_SPACING = LAYOUT_FEATURE_COUNT + 6;
+
+	/**
+	 * The number of structural features of the '<em>Flow Layout</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_LAYOUT_FEATURE_COUNT = LAYOUT_FEATURE_COUNT + 7;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.gmf.gmfgraph.impl.XYLayoutImpl <em>XY Layout</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.gmf.gmfgraph.impl.XYLayoutImpl
+	 * @see org.eclipse.gmf.gmfgraph.impl.GMFGraphPackageImpl#getXYLayout()
+	 * @generated
+	 */
+	int XY_LAYOUT = 56;
+
+	/**
+	 * The number of structural features of the '<em>XY Layout</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XY_LAYOUT_FEATURE_COUNT = LAYOUT_FEATURE_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.gmf.gmfgraph.impl.XYLayoutDataImpl <em>XY Layout Data</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.gmf.gmfgraph.impl.XYLayoutDataImpl
+	 * @see org.eclipse.gmf.gmfgraph.impl.GMFGraphPackageImpl#getXYLayoutData()
+	 * @generated
+	 */
+	int XY_LAYOUT_DATA = 57;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XY_LAYOUT_DATA__OWNER = LAYOUT_DATA__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Top Left</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XY_LAYOUT_DATA__TOP_LEFT = LAYOUT_DATA_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Size</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XY_LAYOUT_DATA__SIZE = LAYOUT_DATA_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>XY Layout Data</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XY_LAYOUT_DATA_FEATURE_COUNT = LAYOUT_DATA_FEATURE_COUNT + 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.gmf.gmfgraph.impl.StackLayoutImpl <em>Stack Layout</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.gmf.gmfgraph.impl.StackLayoutImpl
+	 * @see org.eclipse.gmf.gmfgraph.impl.GMFGraphPackageImpl#getStackLayout()
+	 * @generated
+	 */
+	int STACK_LAYOUT = 58;
+
+	/**
+	 * The number of structural features of the '<em>Stack Layout</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STACK_LAYOUT_FEATURE_COUNT = LAYOUT_FEATURE_COUNT + 0;
+
+	/**
 	 * The meta object id for the '{@link org.eclipse.gmf.gmfgraph.ColorConstants <em>Color Constants</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -5029,7 +5195,7 @@
 	 * @see org.eclipse.gmf.gmfgraph.impl.GMFGraphPackageImpl#getColorConstants()
 	 * @generated
 	 */
-	int COLOR_CONSTANTS = 55;
+	int COLOR_CONSTANTS = 59;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.gmf.gmfgraph.Direction <em>Direction</em>}' enum.
@@ -5039,7 +5205,7 @@
 	 * @see org.eclipse.gmf.gmfgraph.impl.GMFGraphPackageImpl#getDirection()
 	 * @generated
 	 */
-	int DIRECTION = 57;
+	int DIRECTION = 61;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.gmf.gmfgraph.LineKind <em>Line Kind</em>}' enum.
@@ -5049,7 +5215,7 @@
 	 * @see org.eclipse.gmf.gmfgraph.impl.GMFGraphPackageImpl#getLineKind()
 	 * @generated
 	 */
-	int LINE_KIND = 58;
+	int LINE_KIND = 62;
 
 
 	/**
@@ -5060,7 +5226,7 @@
 	 * @see org.eclipse.gmf.gmfgraph.impl.GMFGraphPackageImpl#getAlignment()
 	 * @generated
 	 */
-	int ALIGNMENT = 59;
+	int ALIGNMENT = 63;
 
 
 	/**
@@ -6592,6 +6758,145 @@
 	EAttribute getCustomAttribute_MultiStatementValue();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.gmf.gmfgraph.FlowLayout <em>Flow Layout</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Flow Layout</em>'.
+	 * @see org.eclipse.gmf.gmfgraph.FlowLayout
+	 * @generated
+	 */
+	EClass getFlowLayout();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.gmfgraph.FlowLayout#isVertical <em>Vertical</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Vertical</em>'.
+	 * @see org.eclipse.gmf.gmfgraph.FlowLayout#isVertical()
+	 * @see #getFlowLayout()
+	 * @generated
+	 */
+	EAttribute getFlowLayout_Vertical();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.gmfgraph.FlowLayout#isMatchMinorSize <em>Match Minor Size</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Match Minor Size</em>'.
+	 * @see org.eclipse.gmf.gmfgraph.FlowLayout#isMatchMinorSize()
+	 * @see #getFlowLayout()
+	 * @generated
+	 */
+	EAttribute getFlowLayout_MatchMinorSize();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.gmfgraph.FlowLayout#isForceSingleLine <em>Force Single Line</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Force Single Line</em>'.
+	 * @see org.eclipse.gmf.gmfgraph.FlowLayout#isForceSingleLine()
+	 * @see #getFlowLayout()
+	 * @generated
+	 */
+	EAttribute getFlowLayout_ForceSingleLine();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.gmfgraph.FlowLayout#getMajorAlignment <em>Major Alignment</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Major Alignment</em>'.
+	 * @see org.eclipse.gmf.gmfgraph.FlowLayout#getMajorAlignment()
+	 * @see #getFlowLayout()
+	 * @generated
+	 */
+	EAttribute getFlowLayout_MajorAlignment();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.gmfgraph.FlowLayout#getMinorAlignment <em>Minor Alignment</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Minor Alignment</em>'.
+	 * @see org.eclipse.gmf.gmfgraph.FlowLayout#getMinorAlignment()
+	 * @see #getFlowLayout()
+	 * @generated
+	 */
+	EAttribute getFlowLayout_MinorAlignment();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.gmfgraph.FlowLayout#getMajorSpacing <em>Major Spacing</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Major Spacing</em>'.
+	 * @see org.eclipse.gmf.gmfgraph.FlowLayout#getMajorSpacing()
+	 * @see #getFlowLayout()
+	 * @generated
+	 */
+	EAttribute getFlowLayout_MajorSpacing();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.gmfgraph.FlowLayout#getMinorSpacing <em>Minor Spacing</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Minor Spacing</em>'.
+	 * @see org.eclipse.gmf.gmfgraph.FlowLayout#getMinorSpacing()
+	 * @see #getFlowLayout()
+	 * @generated
+	 */
+	EAttribute getFlowLayout_MinorSpacing();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.gmf.gmfgraph.XYLayout <em>XY Layout</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>XY Layout</em>'.
+	 * @see org.eclipse.gmf.gmfgraph.XYLayout
+	 * @generated
+	 */
+	EClass getXYLayout();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.gmf.gmfgraph.XYLayoutData <em>XY Layout Data</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>XY Layout Data</em>'.
+	 * @see org.eclipse.gmf.gmfgraph.XYLayoutData
+	 * @generated
+	 */
+	EClass getXYLayoutData();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.gmf.gmfgraph.XYLayoutData#getTopLeft <em>Top Left</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Top Left</em>'.
+	 * @see org.eclipse.gmf.gmfgraph.XYLayoutData#getTopLeft()
+	 * @see #getXYLayoutData()
+	 * @generated
+	 */
+	EReference getXYLayoutData_TopLeft();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.gmf.gmfgraph.XYLayoutData#getSize <em>Size</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Size</em>'.
+	 * @see org.eclipse.gmf.gmfgraph.XYLayoutData#getSize()
+	 * @see #getXYLayoutData()
+	 * @generated
+	 */
+	EReference getXYLayoutData_Size();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.gmf.gmfgraph.StackLayout <em>Stack Layout</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Stack Layout</em>'.
+	 * @see org.eclipse.gmf.gmfgraph.StackLayout
+	 * @generated
+	 */
+	EClass getStackLayout();
+
+	/**
 	 * Returns the meta object for enum '{@link org.eclipse.gmf.gmfgraph.ColorConstants <em>Color Constants</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
Index: src/org/eclipse/gmf/gmfgraph/util/FigureQualifiedNameSwitch.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/util/FigureQualifiedNameSwitch.java,v
retrieving revision 1.3
diff -u -r1.3 FigureQualifiedNameSwitch.java
--- src/org/eclipse/gmf/gmfgraph/util/FigureQualifiedNameSwitch.java	13 Feb 2006 17:36:31 -0000	1.3
+++ src/org/eclipse/gmf/gmfgraph/util/FigureQualifiedNameSwitch.java	15 Feb 2006 13:40:56 -0000
@@ -14,6 +14,7 @@
 import org.eclipse.gmf.gmfgraph.BorderLayout;
 import org.eclipse.gmf.gmfgraph.CustomClass;
 import org.eclipse.gmf.gmfgraph.Ellipse;
+import org.eclipse.gmf.gmfgraph.FlowLayout;
 import org.eclipse.gmf.gmfgraph.GridLayout;
 import org.eclipse.gmf.gmfgraph.GridLayoutData;
 import org.eclipse.gmf.gmfgraph.Label;
@@ -25,6 +26,9 @@
 import org.eclipse.gmf.gmfgraph.PolylineDecoration;
 import org.eclipse.gmf.gmfgraph.Rectangle;
 import org.eclipse.gmf.gmfgraph.RoundedRectangle;
+import org.eclipse.gmf.gmfgraph.StackLayout;
+import org.eclipse.gmf.gmfgraph.XYLayout;
+import org.eclipse.gmf.gmfgraph.XYLayoutData;
 
 /**
  * @author artem
@@ -43,6 +47,22 @@
 	public Object caseGridLayoutData(GridLayoutData object) {
 		return "org.eclipse.gmf.internal.codegen.draw2d.GridLayoutData";
 	}
+	
+	public Object caseFlowLayout(FlowLayout object) {
+		return object.isForceSingleLine() ? "org.eclipse.draw2d.ToolbarLayout" : "org.eclipse.draw2d.FlowLayout";
+	}
+	
+	public Object caseXYLayout(XYLayout object) {
+		return "org.eclipse.draw2d.XYLayout";
+	}
+	
+	public Object caseXYLayoutData(XYLayoutData object) {
+		return "org.eclipse.draw2d.geometry.Rectangle";
+	}
+	
+	public Object caseStackLayout(StackLayout object) {
+		return "org.eclipse.draw2d.StackLayout";
+	}
 
 	public Object caseBorderLayout(BorderLayout object) {
 		return "org.eclipse.draw2d.BorderLayout";
Index: src/org/eclipse/gmf/gmfgraph/util/GMFGraphAdapterFactory.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/util/GMFGraphAdapterFactory.java,v
retrieving revision 1.5
diff -u -r1.5 GMFGraphAdapterFactory.java
--- src/org/eclipse/gmf/gmfgraph/util/GMFGraphAdapterFactory.java	14 Feb 2006 10:11:40 -0000	1.5
+++ src/org/eclipse/gmf/gmfgraph/util/GMFGraphAdapterFactory.java	15 Feb 2006 13:40:57 -0000
@@ -288,6 +288,18 @@
 			public Object caseCustomAttribute(CustomAttribute object) {
 				return createCustomAttributeAdapter();
 			}
+			public Object caseFlowLayout(FlowLayout object) {
+				return createFlowLayoutAdapter();
+			}
+			public Object caseXYLayout(XYLayout object) {
+				return createXYLayoutAdapter();
+			}
+			public Object caseXYLayoutData(XYLayoutData object) {
+				return createXYLayoutDataAdapter();
+			}
+			public Object caseStackLayout(StackLayout object) {
+				return createStackLayoutAdapter();
+			}
 			public Object defaultCase(EObject object) {
 				return createEObjectAdapter();
 			}
@@ -1077,6 +1089,62 @@
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.gmfgraph.FlowLayout <em>Flow Layout</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.gmfgraph.FlowLayout
+	 * @generated
+	 */
+	public Adapter createFlowLayoutAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.gmfgraph.XYLayout <em>XY Layout</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.gmfgraph.XYLayout
+	 * @generated
+	 */
+	public Adapter createXYLayoutAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.gmfgraph.XYLayoutData <em>XY Layout Data</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.gmfgraph.XYLayoutData
+	 * @generated
+	 */
+	public Adapter createXYLayoutDataAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.gmfgraph.StackLayout <em>Stack Layout</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.gmfgraph.StackLayout
+	 * @generated
+	 */
+	public Adapter createStackLayoutAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for the default case.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
Index: src/org/eclipse/gmf/gmfgraph/util/GMFGraphSwitch.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/util/GMFGraphSwitch.java,v
retrieving revision 1.5
diff -u -r1.5 GMFGraphSwitch.java
--- src/org/eclipse/gmf/gmfgraph/util/GMFGraphSwitch.java	14 Feb 2006 10:11:40 -0000	1.5
+++ src/org/eclipse/gmf/gmfgraph/util/GMFGraphSwitch.java	15 Feb 2006 13:40:57 -0000
@@ -595,6 +595,34 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case GMFGraphPackage.FLOW_LAYOUT: {
+				FlowLayout flowLayout = (FlowLayout)theEObject;
+				Object result = caseFlowLayout(flowLayout);
+				if (result == null) result = caseLayout(flowLayout);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case GMFGraphPackage.XY_LAYOUT: {
+				XYLayout xyLayout = (XYLayout)theEObject;
+				Object result = caseXYLayout(xyLayout);
+				if (result == null) result = caseLayout(xyLayout);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case GMFGraphPackage.XY_LAYOUT_DATA: {
+				XYLayoutData xyLayoutData = (XYLayoutData)theEObject;
+				Object result = caseXYLayoutData(xyLayoutData);
+				if (result == null) result = caseLayoutData(xyLayoutData);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case GMFGraphPackage.STACK_LAYOUT: {
+				StackLayout stackLayout = (StackLayout)theEObject;
+				Object result = caseStackLayout(stackLayout);
+				if (result == null) result = caseLayout(stackLayout);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			default: return defaultCase(theEObject);
 		}
 	}
@@ -1425,6 +1453,66 @@
 	}
 
 	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Flow Layout</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpretting the object as an instance of '<em>Flow Layout</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseFlowLayout(FlowLayout object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpretting the object as an instance of '<em>XY Layout</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpretting the object as an instance of '<em>XY Layout</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseXYLayout(XYLayout object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpretting the object as an instance of '<em>XY Layout Data</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpretting the object as an instance of '<em>XY Layout Data</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseXYLayoutData(XYLayoutData object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Stack Layout</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpretting the object as an instance of '<em>Stack Layout</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseStackLayout(StackLayout object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
Index: models/gmfgraph.ecore
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef/models/gmfgraph.ecore,v
retrieving revision 1.8
diff -u -r1.8 gmfgraph.ecore
--- models/gmfgraph.ecore	14 Feb 2006 11:16:16 -0000	1.8
+++ models/gmfgraph.ecore	15 Feb 2006 13:40:54 -0000
@@ -372,4 +372,28 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="multiStatementValue" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="FlowLayout" eSuperTypes="#//Layout">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="vertical" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="matchMinorSize" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="forceSingleLine" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="majorAlignment" eType="#//Alignment"
+        defaultValueLiteral="BEGINNING"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minorAlignment" eType="#//Alignment"
+        defaultValueLiteral="BEGINNING"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="majorSpacing" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="5"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minorSpacing" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="5"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="XYLayout" eSuperTypes="#//Layout"/>
+  <eClassifiers xsi:type="ecore:EClass" name="XYLayoutData" eSuperTypes="#//LayoutData">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="topLeft" lowerBound="1"
+        eType="#//Point" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="size" lowerBound="1" eType="#//Dimension"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="StackLayout" eSuperTypes="#//Layout"/>
 </ecore:EPackage>
Index: src/org/eclipse/gmf/gmfgraph/impl/GMFGraphPackageImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/GMFGraphPackageImpl.java,v
retrieving revision 1.7
diff -u -r1.7 GMFGraphPackageImpl.java
--- src/org/eclipse/gmf/gmfgraph/impl/GMFGraphPackageImpl.java	14 Feb 2006 10:11:40 -0000	1.7
+++ src/org/eclipse/gmf/gmfgraph/impl/GMFGraphPackageImpl.java	15 Feb 2006 13:40:56 -0000
@@ -44,6 +44,7 @@
 import org.eclipse.gmf.gmfgraph.FigureGallery;
 import org.eclipse.gmf.gmfgraph.FigureMarker;
 import org.eclipse.gmf.gmfgraph.FigureRef;
+import org.eclipse.gmf.gmfgraph.FlowLayout;
 import org.eclipse.gmf.gmfgraph.Font;
 import org.eclipse.gmf.gmfgraph.FontStyle;
 import org.eclipse.gmf.gmfgraph.GMFGraphFactory;
@@ -73,8 +74,12 @@
 import org.eclipse.gmf.gmfgraph.Rectangle;
 import org.eclipse.gmf.gmfgraph.RoundedRectangle;
 import org.eclipse.gmf.gmfgraph.Shape;
+import org.eclipse.gmf.gmfgraph.StackLayout;
 import org.eclipse.gmf.gmfgraph.VisualFacet;
 
+import org.eclipse.gmf.gmfgraph.XYLayout;
+import org.eclipse.gmf.gmfgraph.XYLayoutData;
+
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
@@ -472,6 +477,34 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass flowLayoutEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass xyLayoutEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass xyLayoutDataEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass stackLayoutEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EEnum colorConstantsEEnum = null;
 
 	/**
@@ -1871,6 +1904,123 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EClass getFlowLayout() {
+		return flowLayoutEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getFlowLayout_Vertical() {
+		return (EAttribute)flowLayoutEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getFlowLayout_MatchMinorSize() {
+		return (EAttribute)flowLayoutEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getFlowLayout_ForceSingleLine() {
+		return (EAttribute)flowLayoutEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getFlowLayout_MajorAlignment() {
+		return (EAttribute)flowLayoutEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getFlowLayout_MinorAlignment() {
+		return (EAttribute)flowLayoutEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getFlowLayout_MajorSpacing() {
+		return (EAttribute)flowLayoutEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getFlowLayout_MinorSpacing() {
+		return (EAttribute)flowLayoutEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getXYLayout() {
+		return xyLayoutEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getXYLayoutData() {
+		return xyLayoutDataEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getXYLayoutData_TopLeft() {
+		return (EReference)xyLayoutDataEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getXYLayoutData_Size() {
+		return (EReference)xyLayoutDataEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getStackLayout() {
+		return stackLayoutEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EEnum getColorConstants() {
 		return colorConstantsEEnum;
 	}
@@ -2128,6 +2278,23 @@
 		createEAttribute(customAttributeEClass, CUSTOM_ATTRIBUTE__DIRECT_ACCESS);
 		createEAttribute(customAttributeEClass, CUSTOM_ATTRIBUTE__MULTI_STATEMENT_VALUE);
 
+		flowLayoutEClass = createEClass(FLOW_LAYOUT);
+		createEAttribute(flowLayoutEClass, FLOW_LAYOUT__VERTICAL);
+		createEAttribute(flowLayoutEClass, FLOW_LAYOUT__MATCH_MINOR_SIZE);
+		createEAttribute(flowLayoutEClass, FLOW_LAYOUT__FORCE_SINGLE_LINE);
+		createEAttribute(flowLayoutEClass, FLOW_LAYOUT__MAJOR_ALIGNMENT);
+		createEAttribute(flowLayoutEClass, FLOW_LAYOUT__MINOR_ALIGNMENT);
+		createEAttribute(flowLayoutEClass, FLOW_LAYOUT__MAJOR_SPACING);
+		createEAttribute(flowLayoutEClass, FLOW_LAYOUT__MINOR_SPACING);
+
+		xyLayoutEClass = createEClass(XY_LAYOUT);
+
+		xyLayoutDataEClass = createEClass(XY_LAYOUT_DATA);
+		createEReference(xyLayoutDataEClass, XY_LAYOUT_DATA__TOP_LEFT);
+		createEReference(xyLayoutDataEClass, XY_LAYOUT_DATA__SIZE);
+
+		stackLayoutEClass = createEClass(STACK_LAYOUT);
+
 		// Create enums
 		colorConstantsEEnum = createEEnum(COLOR_CONSTANTS);
 		fontStyleEEnum = createEEnum(FONT_STYLE);
@@ -2211,6 +2378,10 @@
 		customLayoutEClass.getESuperTypes().add(this.getCustomClass());
 		gridLayoutEClass.getESuperTypes().add(this.getLayout());
 		borderLayoutEClass.getESuperTypes().add(this.getLayout());
+		flowLayoutEClass.getESuperTypes().add(this.getLayout());
+		xyLayoutEClass.getESuperTypes().add(this.getLayout());
+		xyLayoutDataEClass.getESuperTypes().add(this.getLayoutData());
+		stackLayoutEClass.getESuperTypes().add(this.getLayout());
 
 		// Initialize classes and features; add operations and parameters
 		initEClass(canvasEClass, Canvas.class, "Canvas", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -2389,7 +2560,7 @@
 		initEAttribute(getBorderLayoutData_Vertical(), ecorePackage.getEBoolean(), "vertical", "false", 0, 1, BorderLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(layoutableEClass, Layoutable.class, "Layoutable", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getLayoutable_LayoutData(), this.getLayoutData(), this.getLayoutData_Owner(), "layoutData", "", 0, 1, Layoutable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getLayoutable_LayoutData(), this.getLayoutData(), this.getLayoutData_Owner(), "layoutData", null, 0, 1, Layoutable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getLayoutable_Layout(), this.getLayout(), null, "layout", null, 0, 1, Layoutable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(layoutEClass, Layout.class, "Layout", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -2411,6 +2582,23 @@
 		initEAttribute(getCustomAttribute_DirectAccess(), ecorePackage.getEBoolean(), "directAccess", "false", 1, 1, CustomAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getCustomAttribute_MultiStatementValue(), ecorePackage.getEBoolean(), "multiStatementValue", "false", 1, 1, CustomAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+		initEClass(flowLayoutEClass, FlowLayout.class, "FlowLayout", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getFlowLayout_Vertical(), ecorePackage.getEBoolean(), "vertical", "false", 0, 1, FlowLayout.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getFlowLayout_MatchMinorSize(), ecorePackage.getEBoolean(), "matchMinorSize", "false", 0, 1, FlowLayout.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getFlowLayout_ForceSingleLine(), ecorePackage.getEBoolean(), "forceSingleLine", "false", 0, 1, FlowLayout.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getFlowLayout_MajorAlignment(), this.getAlignment(), "majorAlignment", "BEGINNING", 0, 1, FlowLayout.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getFlowLayout_MinorAlignment(), this.getAlignment(), "minorAlignment", "BEGINNING", 0, 1, FlowLayout.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getFlowLayout_MajorSpacing(), ecorePackage.getEInt(), "majorSpacing", "5", 0, 1, FlowLayout.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getFlowLayout_MinorSpacing(), ecorePackage.getEInt(), "minorSpacing", "5", 0, 1, FlowLayout.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(xyLayoutEClass, XYLayout.class, "XYLayout", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(xyLayoutDataEClass, XYLayoutData.class, "XYLayoutData", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getXYLayoutData_TopLeft(), this.getPoint(), null, "topLeft", null, 1, 1, XYLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getXYLayoutData_Size(), this.getDimension(), null, "size", null, 1, 1, XYLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(stackLayoutEClass, StackLayout.class, "StackLayout", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
 		// Initialize enums and add enum literals
 		initEEnum(colorConstantsEEnum, ColorConstants.class, "ColorConstants");
 		addEEnumLiteral(colorConstantsEEnum, ColorConstants.WHITE_LITERAL);
Index: src/org/eclipse/gmf/gmfgraph/impl/GMFGraphFactoryImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/GMFGraphFactoryImpl.java,v
retrieving revision 1.6
diff -u -r1.6 GMFGraphFactoryImpl.java
--- src/org/eclipse/gmf/gmfgraph/impl/GMFGraphFactoryImpl.java	14 Feb 2006 10:11:40 -0000	1.6
+++ src/org/eclipse/gmf/gmfgraph/impl/GMFGraphFactoryImpl.java	15 Feb 2006 13:40:56 -0000
@@ -144,6 +144,10 @@
 			case GMFGraphPackage.GRID_LAYOUT: return createGridLayout();
 			case GMFGraphPackage.BORDER_LAYOUT: return createBorderLayout();
 			case GMFGraphPackage.CUSTOM_ATTRIBUTE: return createCustomAttribute();
+			case GMFGraphPackage.FLOW_LAYOUT: return createFlowLayout();
+			case GMFGraphPackage.XY_LAYOUT: return createXYLayout();
+			case GMFGraphPackage.XY_LAYOUT_DATA: return createXYLayoutData();
+			case GMFGraphPackage.STACK_LAYOUT: return createStackLayout();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -598,6 +602,46 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public FlowLayout createFlowLayout() {
+		FlowLayoutImpl flowLayout = new FlowLayoutImpl();
+		return flowLayout;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public XYLayout createXYLayout() {
+		XYLayoutImpl xyLayout = new XYLayoutImpl();
+		return xyLayout;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public XYLayoutData createXYLayoutData() {
+		XYLayoutDataImpl xyLayoutData = new XYLayoutDataImpl();
+		return xyLayoutData;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StackLayout createStackLayout() {
+		StackLayoutImpl stackLayout = new StackLayoutImpl();
+		return stackLayout;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public ColorConstants createColorConstantsFromString(EDataType eDataType, String initialValue) {
 		ColorConstants result = ColorConstants.get(initialValue);
 		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
Index: src/org/eclipse/gmf/gmfgraph/impl/XYLayoutDataImpl.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/impl/XYLayoutDataImpl.java
diff -N src/org/eclipse/gmf/gmfgraph/impl/XYLayoutDataImpl.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/impl/XYLayoutDataImpl.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,316 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+import org.eclipse.gmf.gmfgraph.Dimension;
+import org.eclipse.gmf.gmfgraph.GMFGraphPackage;
+import org.eclipse.gmf.gmfgraph.Layoutable;
+import org.eclipse.gmf.gmfgraph.Point;
+import org.eclipse.gmf.gmfgraph.XYLayoutData;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>XY Layout Data</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.gmf.gmfgraph.impl.XYLayoutDataImpl#getOwner <em>Owner</em>}</li>
+ *   <li>{@link org.eclipse.gmf.gmfgraph.impl.XYLayoutDataImpl#getTopLeft <em>Top Left</em>}</li>
+ *   <li>{@link org.eclipse.gmf.gmfgraph.impl.XYLayoutDataImpl#getSize <em>Size</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class XYLayoutDataImpl extends EObjectImpl implements XYLayoutData {
+	/**
+	 * The cached value of the '{@link #getTopLeft() <em>Top Left</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTopLeft()
+	 * @generated
+	 * @ordered
+	 */
+	protected Point topLeft = null;
+
+	/**
+	 * The cached value of the '{@link #getSize() <em>Size</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSize()
+	 * @generated
+	 * @ordered
+	 */
+	protected Dimension size = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected XYLayoutDataImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return GMFGraphPackage.eINSTANCE.getXYLayoutData();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Layoutable getOwner() {
+		if (eContainerFeatureID != GMFGraphPackage.XY_LAYOUT_DATA__OWNER) return null;
+		return (Layoutable)eContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setOwner(Layoutable newOwner) {
+		if (newOwner != eInternalContainer() || (eContainerFeatureID != GMFGraphPackage.XY_LAYOUT_DATA__OWNER && newOwner != null)) {
+			if (EcoreUtil.isAncestor(this, newOwner))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newOwner != null)
+				msgs = ((InternalEObject)newOwner).eInverseAdd(this, GMFGraphPackage.LAYOUTABLE__LAYOUT_DATA, Layoutable.class, msgs);
+			msgs = eBasicSetContainer((InternalEObject)newOwner, GMFGraphPackage.XY_LAYOUT_DATA__OWNER, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.XY_LAYOUT_DATA__OWNER, newOwner, newOwner));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Point getTopLeft() {
+		return topLeft;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetTopLeft(Point newTopLeft, NotificationChain msgs) {
+		Point oldTopLeft = topLeft;
+		topLeft = newTopLeft;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.XY_LAYOUT_DATA__TOP_LEFT, oldTopLeft, newTopLeft);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTopLeft(Point newTopLeft) {
+		if (newTopLeft != topLeft) {
+			NotificationChain msgs = null;
+			if (topLeft != null)
+				msgs = ((InternalEObject)topLeft).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.XY_LAYOUT_DATA__TOP_LEFT, null, msgs);
+			if (newTopLeft != null)
+				msgs = ((InternalEObject)newTopLeft).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.XY_LAYOUT_DATA__TOP_LEFT, null, msgs);
+			msgs = basicSetTopLeft(newTopLeft, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.XY_LAYOUT_DATA__TOP_LEFT, newTopLeft, newTopLeft));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Dimension getSize() {
+		return size;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetSize(Dimension newSize, NotificationChain msgs) {
+		Dimension oldSize = size;
+		size = newSize;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.XY_LAYOUT_DATA__SIZE, oldSize, newSize);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSize(Dimension newSize) {
+		if (newSize != size) {
+			NotificationChain msgs = null;
+			if (size != null)
+				msgs = ((InternalEObject)size).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.XY_LAYOUT_DATA__SIZE, null, msgs);
+			if (newSize != null)
+				msgs = ((InternalEObject)newSize).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.XY_LAYOUT_DATA__SIZE, null, msgs);
+			msgs = basicSetSize(newSize, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.XY_LAYOUT_DATA__SIZE, newSize, newSize));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case GMFGraphPackage.XY_LAYOUT_DATA__OWNER:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return eBasicSetContainer(otherEnd, GMFGraphPackage.XY_LAYOUT_DATA__OWNER, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case GMFGraphPackage.XY_LAYOUT_DATA__OWNER:
+				return eBasicSetContainer(null, GMFGraphPackage.XY_LAYOUT_DATA__OWNER, msgs);
+			case GMFGraphPackage.XY_LAYOUT_DATA__TOP_LEFT:
+				return basicSetTopLeft(null, msgs);
+			case GMFGraphPackage.XY_LAYOUT_DATA__SIZE:
+				return basicSetSize(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID) {
+			case GMFGraphPackage.XY_LAYOUT_DATA__OWNER:
+				return eInternalContainer().eInverseRemove(this, GMFGraphPackage.LAYOUTABLE__LAYOUT_DATA, Layoutable.class, msgs);
+		}
+		return super.eBasicRemoveFromContainerFeature(msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case GMFGraphPackage.XY_LAYOUT_DATA__OWNER:
+				return getOwner();
+			case GMFGraphPackage.XY_LAYOUT_DATA__TOP_LEFT:
+				return getTopLeft();
+			case GMFGraphPackage.XY_LAYOUT_DATA__SIZE:
+				return getSize();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case GMFGraphPackage.XY_LAYOUT_DATA__OWNER:
+				setOwner((Layoutable)newValue);
+				return;
+			case GMFGraphPackage.XY_LAYOUT_DATA__TOP_LEFT:
+				setTopLeft((Point)newValue);
+				return;
+			case GMFGraphPackage.XY_LAYOUT_DATA__SIZE:
+				setSize((Dimension)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case GMFGraphPackage.XY_LAYOUT_DATA__OWNER:
+				setOwner((Layoutable)null);
+				return;
+			case GMFGraphPackage.XY_LAYOUT_DATA__TOP_LEFT:
+				setTopLeft((Point)null);
+				return;
+			case GMFGraphPackage.XY_LAYOUT_DATA__SIZE:
+				setSize((Dimension)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case GMFGraphPackage.XY_LAYOUT_DATA__OWNER:
+				return getOwner() != null;
+			case GMFGraphPackage.XY_LAYOUT_DATA__TOP_LEFT:
+				return topLeft != null;
+			case GMFGraphPackage.XY_LAYOUT_DATA__SIZE:
+				return size != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //XYLayoutDataImpl
Index: src/org/eclipse/gmf/gmfgraph/impl/StackLayoutImpl.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/impl/StackLayoutImpl.java
diff -N src/org/eclipse/gmf/gmfgraph/impl/StackLayoutImpl.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/impl/StackLayoutImpl.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,44 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+import org.eclipse.gmf.gmfgraph.GMFGraphPackage;
+import org.eclipse.gmf.gmfgraph.StackLayout;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Stack Layout</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class StackLayoutImpl extends EObjectImpl implements StackLayout {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected StackLayoutImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return GMFGraphPackage.eINSTANCE.getStackLayout();
+	}
+
+} //StackLayoutImpl
Index: src/org/eclipse/gmf/gmfgraph/impl/XYLayoutImpl.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/impl/XYLayoutImpl.java
diff -N src/org/eclipse/gmf/gmfgraph/impl/XYLayoutImpl.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/impl/XYLayoutImpl.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,44 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+import org.eclipse.gmf.gmfgraph.GMFGraphPackage;
+import org.eclipse.gmf.gmfgraph.XYLayout;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>XY Layout</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class XYLayoutImpl extends EObjectImpl implements XYLayout {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected XYLayoutImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return GMFGraphPackage.eINSTANCE.getXYLayout();
+	}
+
+} //XYLayoutImpl
Index: src/org/eclipse/gmf/gmfgraph/StackLayout.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/StackLayout.java
diff -N src/org/eclipse/gmf/gmfgraph/StackLayout.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/StackLayout.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,21 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Stack Layout</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getStackLayout()
+ * @model
+ * @generated
+ */
+public interface StackLayout extends Layout {
+} // StackLayout
Index: src/org/eclipse/gmf/gmfgraph/XYLayoutData.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/XYLayoutData.java
diff -N src/org/eclipse/gmf/gmfgraph/XYLayoutData.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/XYLayoutData.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,80 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>XY Layout Data</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.gmf.gmfgraph.XYLayoutData#getTopLeft <em>Top Left</em>}</li>
+ *   <li>{@link org.eclipse.gmf.gmfgraph.XYLayoutData#getSize <em>Size</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getXYLayoutData()
+ * @model
+ * @generated
+ */
+public interface XYLayoutData extends LayoutData {
+	/**
+	 * Returns the value of the '<em><b>Top Left</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Top Left</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Top Left</em>' containment reference.
+	 * @see #setTopLeft(Point)
+	 * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getXYLayoutData_TopLeft()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	Point getTopLeft();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.XYLayoutData#getTopLeft <em>Top Left</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Top Left</em>' containment reference.
+	 * @see #getTopLeft()
+	 * @generated
+	 */
+	void setTopLeft(Point value);
+
+	/**
+	 * Returns the value of the '<em><b>Size</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Size</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Size</em>' containment reference.
+	 * @see #setSize(Dimension)
+	 * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getXYLayoutData_Size()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	Dimension getSize();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.XYLayoutData#getSize <em>Size</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Size</em>' containment reference.
+	 * @see #getSize()
+	 * @generated
+	 */
+	void setSize(Dimension value);
+
+} // XYLayoutData
Index: src/org/eclipse/gmf/gmfgraph/impl/FlowLayoutImpl.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/impl/FlowLayoutImpl.java
diff -N src/org/eclipse/gmf/gmfgraph/impl/FlowLayoutImpl.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/impl/FlowLayoutImpl.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,486 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+import org.eclipse.gmf.gmfgraph.Alignment;
+import org.eclipse.gmf.gmfgraph.FlowLayout;
+import org.eclipse.gmf.gmfgraph.GMFGraphPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Flow Layout</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.gmf.gmfgraph.impl.FlowLayoutImpl#isVertical <em>Vertical</em>}</li>
+ *   <li>{@link org.eclipse.gmf.gmfgraph.impl.FlowLayoutImpl#isMatchMinorSize <em>Match Minor Size</em>}</li>
+ *   <li>{@link org.eclipse.gmf.gmfgraph.impl.FlowLayoutImpl#isForceSingleLine <em>Force Single Line</em>}</li>
+ *   <li>{@link org.eclipse.gmf.gmfgraph.impl.FlowLayoutImpl#getMajorAlignment <em>Major Alignment</em>}</li>
+ *   <li>{@link org.eclipse.gmf.gmfgraph.impl.FlowLayoutImpl#getMinorAlignment <em>Minor Alignment</em>}</li>
+ *   <li>{@link org.eclipse.gmf.gmfgraph.impl.FlowLayoutImpl#getMajorSpacing <em>Major Spacing</em>}</li>
+ *   <li>{@link org.eclipse.gmf.gmfgraph.impl.FlowLayoutImpl#getMinorSpacing <em>Minor Spacing</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class FlowLayoutImpl extends EObjectImpl implements FlowLayout {
+	/**
+	 * The default value of the '{@link #isVertical() <em>Vertical</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isVertical()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean VERTICAL_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isVertical() <em>Vertical</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isVertical()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean vertical = VERTICAL_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isMatchMinorSize() <em>Match Minor Size</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isMatchMinorSize()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean MATCH_MINOR_SIZE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isMatchMinorSize() <em>Match Minor Size</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isMatchMinorSize()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean matchMinorSize = MATCH_MINOR_SIZE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isForceSingleLine() <em>Force Single Line</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isForceSingleLine()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean FORCE_SINGLE_LINE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isForceSingleLine() <em>Force Single Line</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isForceSingleLine()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean forceSingleLine = FORCE_SINGLE_LINE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getMajorAlignment() <em>Major Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMajorAlignment()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Alignment MAJOR_ALIGNMENT_EDEFAULT = Alignment.BEGINNING_LITERAL;
+
+	/**
+	 * The cached value of the '{@link #getMajorAlignment() <em>Major Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMajorAlignment()
+	 * @generated
+	 * @ordered
+	 */
+	protected Alignment majorAlignment = MAJOR_ALIGNMENT_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getMinorAlignment() <em>Minor Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMinorAlignment()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Alignment MINOR_ALIGNMENT_EDEFAULT = Alignment.BEGINNING_LITERAL;
+
+	/**
+	 * The cached value of the '{@link #getMinorAlignment() <em>Minor Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMinorAlignment()
+	 * @generated
+	 * @ordered
+	 */
+	protected Alignment minorAlignment = MINOR_ALIGNMENT_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getMajorSpacing() <em>Major Spacing</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMajorSpacing()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int MAJOR_SPACING_EDEFAULT = 5;
+
+	/**
+	 * The cached value of the '{@link #getMajorSpacing() <em>Major Spacing</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMajorSpacing()
+	 * @generated
+	 * @ordered
+	 */
+	protected int majorSpacing = MAJOR_SPACING_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getMinorSpacing() <em>Minor Spacing</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMinorSpacing()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int MINOR_SPACING_EDEFAULT = 5;
+
+	/**
+	 * The cached value of the '{@link #getMinorSpacing() <em>Minor Spacing</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMinorSpacing()
+	 * @generated
+	 * @ordered
+	 */
+	protected int minorSpacing = MINOR_SPACING_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FlowLayoutImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return GMFGraphPackage.eINSTANCE.getFlowLayout();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isVertical() {
+		return vertical;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setVertical(boolean newVertical) {
+		boolean oldVertical = vertical;
+		vertical = newVertical;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.FLOW_LAYOUT__VERTICAL, oldVertical, vertical));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isMatchMinorSize() {
+		return matchMinorSize;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setMatchMinorSize(boolean newMatchMinorSize) {
+		boolean oldMatchMinorSize = matchMinorSize;
+		matchMinorSize = newMatchMinorSize;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.FLOW_LAYOUT__MATCH_MINOR_SIZE, oldMatchMinorSize, matchMinorSize));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isForceSingleLine() {
+		return forceSingleLine;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setForceSingleLine(boolean newForceSingleLine) {
+		boolean oldForceSingleLine = forceSingleLine;
+		forceSingleLine = newForceSingleLine;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.FLOW_LAYOUT__FORCE_SINGLE_LINE, oldForceSingleLine, forceSingleLine));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Alignment getMajorAlignment() {
+		return majorAlignment;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setMajorAlignment(Alignment newMajorAlignment) {
+		Alignment oldMajorAlignment = majorAlignment;
+		majorAlignment = newMajorAlignment == null ? MAJOR_ALIGNMENT_EDEFAULT : newMajorAlignment;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.FLOW_LAYOUT__MAJOR_ALIGNMENT, oldMajorAlignment, majorAlignment));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Alignment getMinorAlignment() {
+		return minorAlignment;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setMinorAlignment(Alignment newMinorAlignment) {
+		Alignment oldMinorAlignment = minorAlignment;
+		minorAlignment = newMinorAlignment == null ? MINOR_ALIGNMENT_EDEFAULT : newMinorAlignment;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.FLOW_LAYOUT__MINOR_ALIGNMENT, oldMinorAlignment, minorAlignment));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public int getMajorSpacing() {
+		return majorSpacing;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setMajorSpacing(int newMajorSpacing) {
+		int oldMajorSpacing = majorSpacing;
+		majorSpacing = newMajorSpacing;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.FLOW_LAYOUT__MAJOR_SPACING, oldMajorSpacing, majorSpacing));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public int getMinorSpacing() {
+		return minorSpacing;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setMinorSpacing(int newMinorSpacing) {
+		int oldMinorSpacing = minorSpacing;
+		minorSpacing = newMinorSpacing;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.FLOW_LAYOUT__MINOR_SPACING, oldMinorSpacing, minorSpacing));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case GMFGraphPackage.FLOW_LAYOUT__VERTICAL:
+				return isVertical() ? Boolean.TRUE : Boolean.FALSE;
+			case GMFGraphPackage.FLOW_LAYOUT__MATCH_MINOR_SIZE:
+				return isMatchMinorSize() ? Boolean.TRUE : Boolean.FALSE;
+			case GMFGraphPackage.FLOW_LAYOUT__FORCE_SINGLE_LINE:
+				return isForceSingleLine() ? Boolean.TRUE : Boolean.FALSE;
+			case GMFGraphPackage.FLOW_LAYOUT__MAJOR_ALIGNMENT:
+				return getMajorAlignment();
+			case GMFGraphPackage.FLOW_LAYOUT__MINOR_ALIGNMENT:
+				return getMinorAlignment();
+			case GMFGraphPackage.FLOW_LAYOUT__MAJOR_SPACING:
+				return new Integer(getMajorSpacing());
+			case GMFGraphPackage.FLOW_LAYOUT__MINOR_SPACING:
+				return new Integer(getMinorSpacing());
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case GMFGraphPackage.FLOW_LAYOUT__VERTICAL:
+				setVertical(((Boolean)newValue).booleanValue());
+				return;
+			case GMFGraphPackage.FLOW_LAYOUT__MATCH_MINOR_SIZE:
+				setMatchMinorSize(((Boolean)newValue).booleanValue());
+				return;
+			case GMFGraphPackage.FLOW_LAYOUT__FORCE_SINGLE_LINE:
+				setForceSingleLine(((Boolean)newValue).booleanValue());
+				return;
+			case GMFGraphPackage.FLOW_LAYOUT__MAJOR_ALIGNMENT:
+				setMajorAlignment((Alignment)newValue);
+				return;
+			case GMFGraphPackage.FLOW_LAYOUT__MINOR_ALIGNMENT:
+				setMinorAlignment((Alignment)newValue);
+				return;
+			case GMFGraphPackage.FLOW_LAYOUT__MAJOR_SPACING:
+				setMajorSpacing(((Integer)newValue).intValue());
+				return;
+			case GMFGraphPackage.FLOW_LAYOUT__MINOR_SPACING:
+				setMinorSpacing(((Integer)newValue).intValue());
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case GMFGraphPackage.FLOW_LAYOUT__VERTICAL:
+				setVertical(VERTICAL_EDEFAULT);
+				return;
+			case GMFGraphPackage.FLOW_LAYOUT__MATCH_MINOR_SIZE:
+				setMatchMinorSize(MATCH_MINOR_SIZE_EDEFAULT);
+				return;
+			case GMFGraphPackage.FLOW_LAYOUT__FORCE_SINGLE_LINE:
+				setForceSingleLine(FORCE_SINGLE_LINE_EDEFAULT);
+				return;
+			case GMFGraphPackage.FLOW_LAYOUT__MAJOR_ALIGNMENT:
+				setMajorAlignment(MAJOR_ALIGNMENT_EDEFAULT);
+				return;
+			case GMFGraphPackage.FLOW_LAYOUT__MINOR_ALIGNMENT:
+				setMinorAlignment(MINOR_ALIGNMENT_EDEFAULT);
+				return;
+			case GMFGraphPackage.FLOW_LAYOUT__MAJOR_SPACING:
+				setMajorSpacing(MAJOR_SPACING_EDEFAULT);
+				return;
+			case GMFGraphPackage.FLOW_LAYOUT__MINOR_SPACING:
+				setMinorSpacing(MINOR_SPACING_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case GMFGraphPackage.FLOW_LAYOUT__VERTICAL:
+				return vertical != VERTICAL_EDEFAULT;
+			case GMFGraphPackage.FLOW_LAYOUT__MATCH_MINOR_SIZE:
+				return matchMinorSize != MATCH_MINOR_SIZE_EDEFAULT;
+			case GMFGraphPackage.FLOW_LAYOUT__FORCE_SINGLE_LINE:
+				return forceSingleLine != FORCE_SINGLE_LINE_EDEFAULT;
+			case GMFGraphPackage.FLOW_LAYOUT__MAJOR_ALIGNMENT:
+				return majorAlignment != MAJOR_ALIGNMENT_EDEFAULT;
+			case GMFGraphPackage.FLOW_LAYOUT__MINOR_ALIGNMENT:
+				return minorAlignment != MINOR_ALIGNMENT_EDEFAULT;
+			case GMFGraphPackage.FLOW_LAYOUT__MAJOR_SPACING:
+				return majorSpacing != MAJOR_SPACING_EDEFAULT;
+			case GMFGraphPackage.FLOW_LAYOUT__MINOR_SPACING:
+				return minorSpacing != MINOR_SPACING_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (vertical: ");
+		result.append(vertical);
+		result.append(", matchMinorSize: ");
+		result.append(matchMinorSize);
+		result.append(", forceSingleLine: ");
+		result.append(forceSingleLine);
+		result.append(", majorAlignment: ");
+		result.append(majorAlignment);
+		result.append(", minorAlignment: ");
+		result.append(minorAlignment);
+		result.append(", majorSpacing: ");
+		result.append(majorSpacing);
+		result.append(", minorSpacing: ");
+		result.append(minorSpacing);
+		result.append(')');
+		return result.toString();
+	}
+
+} //FlowLayoutImpl
Index: src/org/eclipse/gmf/gmfgraph/XYLayout.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/XYLayout.java
diff -N src/org/eclipse/gmf/gmfgraph/XYLayout.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/XYLayout.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,21 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>XY Layout</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getXYLayout()
+ * @model
+ * @generated
+ */
+public interface XYLayout extends Layout {
+} // XYLayout
Index: src/org/eclipse/gmf/gmfgraph/FlowLayout.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/FlowLayout.java
diff -N src/org/eclipse/gmf/gmfgraph/FlowLayout.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/FlowLayout.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,228 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Flow Layout</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.gmf.gmfgraph.FlowLayout#isVertical <em>Vertical</em>}</li>
+ *   <li>{@link org.eclipse.gmf.gmfgraph.FlowLayout#isMatchMinorSize <em>Match Minor Size</em>}</li>
+ *   <li>{@link org.eclipse.gmf.gmfgraph.FlowLayout#isForceSingleLine <em>Force Single Line</em>}</li>
+ *   <li>{@link org.eclipse.gmf.gmfgraph.FlowLayout#getMajorAlignment <em>Major Alignment</em>}</li>
+ *   <li>{@link org.eclipse.gmf.gmfgraph.FlowLayout#getMinorAlignment <em>Minor Alignment</em>}</li>
+ *   <li>{@link org.eclipse.gmf.gmfgraph.FlowLayout#getMajorSpacing <em>Major Spacing</em>}</li>
+ *   <li>{@link org.eclipse.gmf.gmfgraph.FlowLayout#getMinorSpacing <em>Minor Spacing</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getFlowLayout()
+ * @model
+ * @generated
+ */
+public interface FlowLayout extends Layout {
+	/**
+	 * Returns the value of the '<em><b>Vertical</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Vertical</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Vertical</em>' attribute.
+	 * @see #setVertical(boolean)
+	 * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getFlowLayout_Vertical()
+	 * @model default="false"
+	 * @generated
+	 */
+	boolean isVertical();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.FlowLayout#isVertical <em>Vertical</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Vertical</em>' attribute.
+	 * @see #isVertical()
+	 * @generated
+	 */
+	void setVertical(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Match Minor Size</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Match Minor Size</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Match Minor Size</em>' attribute.
+	 * @see #setMatchMinorSize(boolean)
+	 * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getFlowLayout_MatchMinorSize()
+	 * @model default="false"
+	 * @generated
+	 */
+	boolean isMatchMinorSize();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.FlowLayout#isMatchMinorSize <em>Match Minor Size</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Match Minor Size</em>' attribute.
+	 * @see #isMatchMinorSize()
+	 * @generated
+	 */
+	void setMatchMinorSize(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Force Single Line</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Force Single Line</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Force Single Line</em>' attribute.
+	 * @see #setForceSingleLine(boolean)
+	 * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getFlowLayout_ForceSingleLine()
+	 * @model default="false"
+	 * @generated
+	 */
+	boolean isForceSingleLine();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.FlowLayout#isForceSingleLine <em>Force Single Line</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Force Single Line</em>' attribute.
+	 * @see #isForceSingleLine()
+	 * @generated
+	 */
+	void setForceSingleLine(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Major Alignment</b></em>' attribute.
+	 * The default value is <code>"BEGINNING"</code>.
+	 * The literals are from the enumeration {@link org.eclipse.gmf.gmfgraph.Alignment}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Major Alignment</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Major Alignment</em>' attribute.
+	 * @see org.eclipse.gmf.gmfgraph.Alignment
+	 * @see #setMajorAlignment(Alignment)
+	 * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getFlowLayout_MajorAlignment()
+	 * @model default="BEGINNING"
+	 * @generated
+	 */
+	Alignment getMajorAlignment();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.FlowLayout#getMajorAlignment <em>Major Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Major Alignment</em>' attribute.
+	 * @see org.eclipse.gmf.gmfgraph.Alignment
+	 * @see #getMajorAlignment()
+	 * @generated
+	 */
+	void setMajorAlignment(Alignment value);
+
+	/**
+	 * Returns the value of the '<em><b>Minor Alignment</b></em>' attribute.
+	 * The default value is <code>"BEGINNING"</code>.
+	 * The literals are from the enumeration {@link org.eclipse.gmf.gmfgraph.Alignment}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Minor Alignment</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Minor Alignment</em>' attribute.
+	 * @see org.eclipse.gmf.gmfgraph.Alignment
+	 * @see #setMinorAlignment(Alignment)
+	 * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getFlowLayout_MinorAlignment()
+	 * @model default="BEGINNING"
+	 * @generated
+	 */
+	Alignment getMinorAlignment();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.FlowLayout#getMinorAlignment <em>Minor Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Minor Alignment</em>' attribute.
+	 * @see org.eclipse.gmf.gmfgraph.Alignment
+	 * @see #getMinorAlignment()
+	 * @generated
+	 */
+	void setMinorAlignment(Alignment value);
+
+	/**
+	 * Returns the value of the '<em><b>Major Spacing</b></em>' attribute.
+	 * The default value is <code>"5"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Major Spacing</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Major Spacing</em>' attribute.
+	 * @see #setMajorSpacing(int)
+	 * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getFlowLayout_MajorSpacing()
+	 * @model default="5"
+	 * @generated
+	 */
+	int getMajorSpacing();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.FlowLayout#getMajorSpacing <em>Major Spacing</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Major Spacing</em>' attribute.
+	 * @see #getMajorSpacing()
+	 * @generated
+	 */
+	void setMajorSpacing(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Minor Spacing</b></em>' attribute.
+	 * The default value is <code>"5"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Minor Spacing</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Minor Spacing</em>' attribute.
+	 * @see #setMinorSpacing(int)
+	 * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getFlowLayout_MinorSpacing()
+	 * @model default="5"
+	 * @generated
+	 */
+	int getMinorSpacing();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.FlowLayout#getMinorSpacing <em>Minor Spacing</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Minor Spacing</em>' attribute.
+	 * @see #getMinorSpacing()
+	 * @generated
+	 */
+	void setMinorSpacing(int value);
+
+} // FlowLayout
#P org.eclipse.gmf.graphdef.edit
Index: src/org/eclipse/gmf/gmfgraph/provider/PolylineConnectionItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/PolylineConnectionItemProvider.java,v
retrieving revision 1.3
diff -u -r1.3 PolylineConnectionItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/PolylineConnectionItemProvider.java	4 Feb 2006 23:36:27 -0000	1.3
+++ src/org/eclipse/gmf/gmfgraph/provider/PolylineConnectionItemProvider.java	15 Feb 2006 13:41:01 -0000
@@ -109,7 +109,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/PolylineConnection");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/PolylineConnection"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/NodeItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/NodeItemProvider.java,v
retrieving revision 1.1
diff -u -r1.1 NodeItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/NodeItemProvider.java	6 Dec 2005 22:12:04 -0000	1.1
+++ src/org/eclipse/gmf/gmfgraph/provider/NodeItemProvider.java	15 Feb 2006 13:41:01 -0000
@@ -90,7 +90,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/Node");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Node"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/CustomFigureItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/CustomFigureItemProvider.java,v
retrieving revision 1.3
diff -u -r1.3 CustomFigureItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/CustomFigureItemProvider.java	13 Feb 2006 17:36:13 -0000	1.3
+++ src/org/eclipse/gmf/gmfgraph/provider/CustomFigureItemProvider.java	15 Feb 2006 13:41:00 -0000
@@ -197,7 +197,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/CustomFigure");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/CustomFigure"));
 	}
 
 	/**
@@ -275,6 +275,11 @@
 
 		newChildDescriptors.add
 			(createChildParameter
+				(GMFGraphPackage.eINSTANCE.getLayoutable_LayoutData(),
+				 GMFGraphFactory.eINSTANCE.createXYLayoutData()));
+
+		newChildDescriptors.add
+			(createChildParameter
 				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
 				 GMFGraphFactory.eINSTANCE.createCustomLayout()));
 
@@ -290,6 +295,21 @@
 
 		newChildDescriptors.add
 			(createChildParameter
+				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
+				 GMFGraphFactory.eINSTANCE.createFlowLayout()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
+				 GMFGraphFactory.eINSTANCE.createXYLayout()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
+				 GMFGraphFactory.eINSTANCE.createStackLayout()));
+
+		newChildDescriptors.add
+			(createChildParameter
 				(GMFGraphPackage.eINSTANCE.getFigure_Children(),
 				 GMFGraphFactory.eINSTANCE.createFigureRef()));
 
Index: src/org/eclipse/gmf/gmfgraph/provider/LabeledContainerItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/LabeledContainerItemProvider.java,v
retrieving revision 1.3
diff -u -r1.3 LabeledContainerItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/LabeledContainerItemProvider.java	13 Feb 2006 17:36:12 -0000	1.3
+++ src/org/eclipse/gmf/gmfgraph/provider/LabeledContainerItemProvider.java	15 Feb 2006 13:41:01 -0000
@@ -154,7 +154,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/LabeledContainer");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/LabeledContainer"));
 	}
 
 	/**
@@ -229,6 +229,11 @@
 
 		newChildDescriptors.add
 			(createChildParameter
+				(GMFGraphPackage.eINSTANCE.getLayoutable_LayoutData(),
+				 GMFGraphFactory.eINSTANCE.createXYLayoutData()));
+
+		newChildDescriptors.add
+			(createChildParameter
 				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
 				 GMFGraphFactory.eINSTANCE.createCustomLayout()));
 
@@ -244,6 +249,21 @@
 
 		newChildDescriptors.add
 			(createChildParameter
+				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
+				 GMFGraphFactory.eINSTANCE.createFlowLayout()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
+				 GMFGraphFactory.eINSTANCE.createXYLayout()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
+				 GMFGraphFactory.eINSTANCE.createStackLayout()));
+
+		newChildDescriptors.add
+			(createChildParameter
 				(GMFGraphPackage.eINSTANCE.getFigure_Children(),
 				 GMFGraphFactory.eINSTANCE.createFigureRef()));
 
Index: src/org/eclipse/gmf/gmfgraph/provider/GeneralFacetItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/GeneralFacetItemProvider.java,v
retrieving revision 1.1
diff -u -r1.1 GeneralFacetItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/GeneralFacetItemProvider.java	6 Dec 2005 22:12:03 -0000	1.1
+++ src/org/eclipse/gmf/gmfgraph/provider/GeneralFacetItemProvider.java	15 Feb 2006 13:41:01 -0000
@@ -112,7 +112,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/GeneralFacet");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/GeneralFacet"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/CustomDecorationItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/CustomDecorationItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 CustomDecorationItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/CustomDecorationItemProvider.java	5 Jan 2006 17:33:16 -0000	1.2
+++ src/org/eclipse/gmf/gmfgraph/provider/CustomDecorationItemProvider.java	15 Feb 2006 13:41:00 -0000
@@ -66,7 +66,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/CustomDecoration");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/CustomDecoration"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/EllipseItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/EllipseItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 EllipseItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/EllipseItemProvider.java	5 Jan 2006 17:33:16 -0000	1.2
+++ src/org/eclipse/gmf/gmfgraph/provider/EllipseItemProvider.java	15 Feb 2006 13:41:00 -0000
@@ -66,7 +66,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/Ellipse");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Ellipse"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/LineBorderItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/LineBorderItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 LineBorderItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/LineBorderItemProvider.java	13 Feb 2006 17:36:12 -0000	1.2
+++ src/org/eclipse/gmf/gmfgraph/provider/LineBorderItemProvider.java	15 Feb 2006 13:41:01 -0000
@@ -108,7 +108,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/LineBorder");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/LineBorder"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/CompartmentItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/CompartmentItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 CompartmentItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/CompartmentItemProvider.java	13 Feb 2006 17:36:13 -0000	1.2
+++ src/org/eclipse/gmf/gmfgraph/provider/CompartmentItemProvider.java	15 Feb 2006 13:41:00 -0000
@@ -111,7 +111,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/Compartment");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Compartment"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/RGBColorItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/RGBColorItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 RGBColorItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/RGBColorItemProvider.java	13 Feb 2006 17:36:12 -0000	1.2
+++ src/org/eclipse/gmf/gmfgraph/provider/RGBColorItemProvider.java	15 Feb 2006 13:41:01 -0000
@@ -133,7 +133,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/RGBColor");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/RGBColor"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/LabelItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/LabelItemProvider.java,v
retrieving revision 1.3
diff -u -r1.3 LabelItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/LabelItemProvider.java	13 Feb 2006 17:36:13 -0000	1.3
+++ src/org/eclipse/gmf/gmfgraph/provider/LabelItemProvider.java	15 Feb 2006 13:41:01 -0000
@@ -175,7 +175,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/Label");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Label"));
 	}
 
 	/**
@@ -251,6 +251,11 @@
 
 		newChildDescriptors.add
 			(createChildParameter
+				(GMFGraphPackage.eINSTANCE.getLayoutable_LayoutData(),
+				 GMFGraphFactory.eINSTANCE.createXYLayoutData()));
+
+		newChildDescriptors.add
+			(createChildParameter
 				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
 				 GMFGraphFactory.eINSTANCE.createCustomLayout()));
 
@@ -266,6 +271,21 @@
 
 		newChildDescriptors.add
 			(createChildParameter
+				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
+				 GMFGraphFactory.eINSTANCE.createFlowLayout()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
+				 GMFGraphFactory.eINSTANCE.createXYLayout()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
+				 GMFGraphFactory.eINSTANCE.createStackLayout()));
+
+		newChildDescriptors.add
+			(createChildParameter
 				(GMFGraphPackage.eINSTANCE.getFigure_Children(),
 				 GMFGraphFactory.eINSTANCE.createFigureRef()));
 
Index: src/org/eclipse/gmf/gmfgraph/provider/DiagramLabelItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/DiagramLabelItemProvider.java,v
retrieving revision 1.1
diff -u -r1.1 DiagramLabelItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/DiagramLabelItemProvider.java	14 Feb 2006 10:11:24 -0000	1.1
+++ src/org/eclipse/gmf/gmfgraph/provider/DiagramLabelItemProvider.java	15 Feb 2006 13:41:00 -0000
@@ -68,7 +68,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/DiagramLabel");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/DiagramLabel"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/RectangleItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/RectangleItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 RectangleItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/RectangleItemProvider.java	5 Jan 2006 17:33:16 -0000	1.2
+++ src/org/eclipse/gmf/gmfgraph/provider/RectangleItemProvider.java	15 Feb 2006 13:41:01 -0000
@@ -66,7 +66,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/Rectangle");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Rectangle"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/CustomBorderItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/CustomBorderItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 CustomBorderItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/CustomBorderItemProvider.java	13 Feb 2006 17:36:13 -0000	1.2
+++ src/org/eclipse/gmf/gmfgraph/provider/CustomBorderItemProvider.java	15 Feb 2006 13:41:00 -0000
@@ -129,7 +129,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/CustomBorder");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/CustomBorder"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/FigureGalleryItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/FigureGalleryItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 FigureGalleryItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/FigureGalleryItemProvider.java	12 Dec 2005 19:15:31 -0000	1.2
+++ src/org/eclipse/gmf/gmfgraph/provider/FigureGalleryItemProvider.java	15 Feb 2006 13:41:00 -0000
@@ -129,7 +129,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/FigureGallery");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/FigureGallery"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/PolylineDecorationItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/PolylineDecorationItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 PolylineDecorationItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/PolylineDecorationItemProvider.java	5 Jan 2006 17:33:16 -0000	1.2
+++ src/org/eclipse/gmf/gmfgraph/provider/PolylineDecorationItemProvider.java	15 Feb 2006 13:41:01 -0000
@@ -66,7 +66,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/PolylineDecoration");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/PolylineDecoration"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/ConnectionItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/ConnectionItemProvider.java,v
retrieving revision 1.1
diff -u -r1.1 ConnectionItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/ConnectionItemProvider.java	6 Dec 2005 22:12:04 -0000	1.1
+++ src/org/eclipse/gmf/gmfgraph/provider/ConnectionItemProvider.java	15 Feb 2006 13:41:00 -0000
@@ -65,7 +65,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/Connection");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Connection"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/CanvasItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/CanvasItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 CanvasItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/CanvasItemProvider.java	14 Feb 2006 10:11:24 -0000	1.2
+++ src/org/eclipse/gmf/gmfgraph/provider/CanvasItemProvider.java	15 Feb 2006 13:41:00 -0000
@@ -126,7 +126,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/Canvas");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Canvas"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/ChildItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/ChildItemProvider.java,v
retrieving revision 1.1
diff -u -r1.1 ChildItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/ChildItemProvider.java	6 Dec 2005 22:12:03 -0000	1.1
+++ src/org/eclipse/gmf/gmfgraph/provider/ChildItemProvider.java	15 Feb 2006 13:41:00 -0000
@@ -65,7 +65,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/Child");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Child"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/PointItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/PointItemProvider.java,v
retrieving revision 1.1
diff -u -r1.1 PointItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/PointItemProvider.java	6 Dec 2005 22:12:04 -0000	1.1
+++ src/org/eclipse/gmf/gmfgraph/provider/PointItemProvider.java	15 Feb 2006 13:41:01 -0000
@@ -112,7 +112,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/Point");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Point"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/BorderLayoutItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/BorderLayoutItemProvider.java,v
retrieving revision 1.1
diff -u -r1.1 BorderLayoutItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/BorderLayoutItemProvider.java	13 Feb 2006 17:36:12 -0000	1.1
+++ src/org/eclipse/gmf/gmfgraph/provider/BorderLayoutItemProvider.java	15 Feb 2006 13:41:00 -0000
@@ -85,7 +85,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/BorderLayout");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/BorderLayout"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/PolygonDecorationItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/PolygonDecorationItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 PolygonDecorationItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/PolygonDecorationItemProvider.java	5 Jan 2006 17:33:16 -0000	1.2
+++ src/org/eclipse/gmf/gmfgraph/provider/PolygonDecorationItemProvider.java	15 Feb 2006 13:41:01 -0000
@@ -66,7 +66,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/PolygonDecoration");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/PolygonDecoration"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/InsetsItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/InsetsItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 InsetsItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/InsetsItemProvider.java	13 Feb 2006 17:36:13 -0000	1.2
+++ src/org/eclipse/gmf/gmfgraph/provider/InsetsItemProvider.java	15 Feb 2006 13:41:01 -0000
@@ -154,7 +154,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/Insets");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Insets"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/GMFGraphItemProviderAdapterFactory.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/GMFGraphItemProviderAdapterFactory.java,v
retrieving revision 1.4
diff -u -r1.4 GMFGraphItemProviderAdapterFactory.java
--- src/org/eclipse/gmf/gmfgraph/provider/GMFGraphItemProviderAdapterFactory.java	14 Feb 2006 10:11:24 -0000	1.4
+++ src/org/eclipse/gmf/gmfgraph/provider/GMFGraphItemProviderAdapterFactory.java	15 Feb 2006 13:41:01 -0000
@@ -954,6 +954,94 @@
 	}
 
 	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.gmfgraph.FlowLayout} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FlowLayoutItemProvider flowLayoutItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.gmf.gmfgraph.FlowLayout}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createFlowLayoutAdapter() {
+		if (flowLayoutItemProvider == null) {
+			flowLayoutItemProvider = new FlowLayoutItemProvider(this);
+		}
+
+		return flowLayoutItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.gmfgraph.XYLayout} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected XYLayoutItemProvider xyLayoutItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.gmf.gmfgraph.XYLayout}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createXYLayoutAdapter() {
+		if (xyLayoutItemProvider == null) {
+			xyLayoutItemProvider = new XYLayoutItemProvider(this);
+		}
+
+		return xyLayoutItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.gmfgraph.XYLayoutData} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected XYLayoutDataItemProvider xyLayoutDataItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.gmf.gmfgraph.XYLayoutData}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createXYLayoutDataAdapter() {
+		if (xyLayoutDataItemProvider == null) {
+			xyLayoutDataItemProvider = new XYLayoutDataItemProvider(this);
+		}
+
+		return xyLayoutDataItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.gmfgraph.StackLayout} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected StackLayoutItemProvider stackLayoutItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.gmf.gmfgraph.StackLayout}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createStackLayoutAdapter() {
+		if (stackLayoutItemProvider == null) {
+			stackLayoutItemProvider = new StackLayoutItemProvider(this);
+		}
+
+		return stackLayoutItemProvider;
+	}
+
+	/**
 	 * This returns the root adapter factory that contains this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1089,6 +1177,10 @@
 		if (gridLayoutItemProvider != null) gridLayoutItemProvider.dispose();
 		if (borderLayoutItemProvider != null) borderLayoutItemProvider.dispose();
 		if (customAttributeItemProvider != null) customAttributeItemProvider.dispose();
+		if (flowLayoutItemProvider != null) flowLayoutItemProvider.dispose();
+		if (xyLayoutItemProvider != null) xyLayoutItemProvider.dispose();
+		if (xyLayoutDataItemProvider != null) xyLayoutDataItemProvider.dispose();
+		if (stackLayoutItemProvider != null) stackLayoutItemProvider.dispose();
 	}
 
 }
Index: src/org/eclipse/gmf/gmfgraph/provider/PolylineItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/PolylineItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 PolylineItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/PolylineItemProvider.java	5 Jan 2006 17:33:16 -0000	1.2
+++ src/org/eclipse/gmf/gmfgraph/provider/PolylineItemProvider.java	15 Feb 2006 13:41:01 -0000
@@ -84,7 +84,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/Polyline");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Polyline"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/PolygonItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/PolygonItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 PolygonItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/PolygonItemProvider.java	5 Jan 2006 17:33:16 -0000	1.2
+++ src/org/eclipse/gmf/gmfgraph/provider/PolygonItemProvider.java	15 Feb 2006 13:41:01 -0000
@@ -66,7 +66,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/Polygon");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Polygon"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/RoundedRectangleItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/RoundedRectangleItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 RoundedRectangleItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/RoundedRectangleItemProvider.java	5 Jan 2006 17:33:16 -0000	1.2
+++ src/org/eclipse/gmf/gmfgraph/provider/RoundedRectangleItemProvider.java	15 Feb 2006 13:41:01 -0000
@@ -111,7 +111,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/RoundedRectangle");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/RoundedRectangle"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/CustomLayoutItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/CustomLayoutItemProvider.java,v
retrieving revision 1.1
diff -u -r1.1 CustomLayoutItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/CustomLayoutItemProvider.java	13 Feb 2006 17:36:13 -0000	1.1
+++ src/org/eclipse/gmf/gmfgraph/provider/CustomLayoutItemProvider.java	15 Feb 2006 13:41:00 -0000
@@ -129,7 +129,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/CustomLayout");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/CustomLayout"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/CustomAttributeItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/CustomAttributeItemProvider.java,v
retrieving revision 1.1
diff -u -r1.1 CustomAttributeItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/CustomAttributeItemProvider.java	13 Feb 2006 17:36:13 -0000	1.1
+++ src/org/eclipse/gmf/gmfgraph/provider/CustomAttributeItemProvider.java	15 Feb 2006 13:41:00 -0000
@@ -154,7 +154,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/CustomAttribute");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/CustomAttribute"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/MarginBorderItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/MarginBorderItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 MarginBorderItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/MarginBorderItemProvider.java	13 Feb 2006 17:36:13 -0000	1.2
+++ src/org/eclipse/gmf/gmfgraph/provider/MarginBorderItemProvider.java	15 Feb 2006 13:41:01 -0000
@@ -85,7 +85,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/MarginBorder");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/MarginBorder"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/ShapeItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/ShapeItemProvider.java,v
retrieving revision 1.5
diff -u -r1.5 ShapeItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/ShapeItemProvider.java	13 Feb 2006 17:36:13 -0000	1.5
+++ src/org/eclipse/gmf/gmfgraph/provider/ShapeItemProvider.java	15 Feb 2006 13:41:01 -0000
@@ -372,6 +372,11 @@
 
 		newChildDescriptors.add
 			(createChildParameter
+				(GMFGraphPackage.eINSTANCE.getLayoutable_LayoutData(),
+				 GMFGraphFactory.eINSTANCE.createXYLayoutData()));
+
+		newChildDescriptors.add
+			(createChildParameter
 				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
 				 GMFGraphFactory.eINSTANCE.createCustomLayout()));
 
@@ -387,6 +392,21 @@
 
 		newChildDescriptors.add
 			(createChildParameter
+				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
+				 GMFGraphFactory.eINSTANCE.createFlowLayout()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
+				 GMFGraphFactory.eINSTANCE.createXYLayout()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
+				 GMFGraphFactory.eINSTANCE.createStackLayout()));
+
+		newChildDescriptors.add
+			(createChildParameter
 				(GMFGraphPackage.eINSTANCE.getFigure_Children(),
 				 GMFGraphFactory.eINSTANCE.createFigureRef()));
 
Index: src/org/eclipse/gmf/gmfgraph/provider/CustomConnectionItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/CustomConnectionItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 CustomConnectionItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/CustomConnectionItemProvider.java	5 Jan 2006 17:33:16 -0000	1.2
+++ src/org/eclipse/gmf/gmfgraph/provider/CustomConnectionItemProvider.java	15 Feb 2006 13:41:00 -0000
@@ -66,7 +66,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/CustomConnection");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/CustomConnection"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/DimensionItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/DimensionItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 DimensionItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/DimensionItemProvider.java	13 Feb 2006 17:36:13 -0000	1.2
+++ src/org/eclipse/gmf/gmfgraph/provider/DimensionItemProvider.java	15 Feb 2006 13:41:00 -0000
@@ -112,7 +112,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/Dimension");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Dimension"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/GridLayoutDataItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/GridLayoutDataItemProvider.java,v
retrieving revision 1.1
diff -u -r1.1 GridLayoutDataItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/GridLayoutDataItemProvider.java	13 Feb 2006 17:36:13 -0000	1.1
+++ src/org/eclipse/gmf/gmfgraph/provider/GridLayoutDataItemProvider.java	15 Feb 2006 13:41:01 -0000
@@ -255,7 +255,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/GridLayoutData");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/GridLayoutData"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/BasicFontItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/BasicFontItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 BasicFontItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/BasicFontItemProvider.java	13 Feb 2006 17:36:13 -0000	1.2
+++ src/org/eclipse/gmf/gmfgraph/provider/BasicFontItemProvider.java	15 Feb 2006 13:40:59 -0000
@@ -133,7 +133,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/BasicFont");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/BasicFont"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/CompoundBorderItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/CompoundBorderItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 CompoundBorderItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/CompoundBorderItemProvider.java	13 Feb 2006 17:36:13 -0000	1.2
+++ src/org/eclipse/gmf/gmfgraph/provider/CompoundBorderItemProvider.java	15 Feb 2006 13:41:00 -0000
@@ -99,7 +99,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/CompoundBorder");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/CompoundBorder"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/FigureRefItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/FigureRefItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 FigureRefItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/FigureRefItemProvider.java	13 Feb 2006 17:36:13 -0000	1.2
+++ src/org/eclipse/gmf/gmfgraph/provider/FigureRefItemProvider.java	15 Feb 2006 13:41:00 -0000
@@ -143,7 +143,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/FigureRef");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/FigureRef"));
 	}
 
 	/**
@@ -201,6 +201,11 @@
 
 		newChildDescriptors.add
 			(createChildParameter
+				(GMFGraphPackage.eINSTANCE.getLayoutable_LayoutData(),
+				 GMFGraphFactory.eINSTANCE.createXYLayoutData()));
+
+		newChildDescriptors.add
+			(createChildParameter
 				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
 				 GMFGraphFactory.eINSTANCE.createCustomLayout()));
 
@@ -213,6 +218,21 @@
 			(createChildParameter
 				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
 				 GMFGraphFactory.eINSTANCE.createBorderLayout()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
+				 GMFGraphFactory.eINSTANCE.createFlowLayout()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
+				 GMFGraphFactory.eINSTANCE.createXYLayout()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
+				 GMFGraphFactory.eINSTANCE.createStackLayout()));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/ConstantColorItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/ConstantColorItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 ConstantColorItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/ConstantColorItemProvider.java	13 Feb 2006 17:36:13 -0000	1.2
+++ src/org/eclipse/gmf/gmfgraph/provider/ConstantColorItemProvider.java	15 Feb 2006 13:41:00 -0000
@@ -92,7 +92,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/ConstantColor");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ConstantColor"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/CustomLayoutDataItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/CustomLayoutDataItemProvider.java,v
retrieving revision 1.1
diff -u -r1.1 CustomLayoutDataItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/CustomLayoutDataItemProvider.java	13 Feb 2006 17:36:13 -0000	1.1
+++ src/org/eclipse/gmf/gmfgraph/provider/CustomLayoutDataItemProvider.java	15 Feb 2006 13:41:00 -0000
@@ -150,7 +150,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/CustomLayoutData");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/CustomLayoutData"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/BorderLayoutDataItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/BorderLayoutDataItemProvider.java,v
retrieving revision 1.1
diff -u -r1.1 BorderLayoutDataItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/BorderLayoutDataItemProvider.java	13 Feb 2006 17:36:13 -0000	1.1
+++ src/org/eclipse/gmf/gmfgraph/provider/BorderLayoutDataItemProvider.java	15 Feb 2006 13:41:00 -0000
@@ -134,7 +134,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/BorderLayoutData");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/BorderLayoutData"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/GradientFacetItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/GradientFacetItemProvider.java,v
retrieving revision 1.1
diff -u -r1.1 GradientFacetItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/GradientFacetItemProvider.java	6 Dec 2005 22:12:03 -0000	1.1
+++ src/org/eclipse/gmf/gmfgraph/provider/GradientFacetItemProvider.java	15 Feb 2006 13:41:01 -0000
@@ -92,7 +92,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/GradientFacet");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/GradientFacet"));
 	}
 
 	/**
Index: src/org/eclipse/gmf/gmfgraph/provider/GridLayoutItemProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/src/org/eclipse/gmf/gmfgraph/provider/GridLayoutItemProvider.java,v
retrieving revision 1.1
diff -u -r1.1 GridLayoutItemProvider.java
--- src/org/eclipse/gmf/gmfgraph/provider/GridLayoutItemProvider.java	13 Feb 2006 17:36:13 -0000	1.1
+++ src/org/eclipse/gmf/gmfgraph/provider/GridLayoutItemProvider.java	15 Feb 2006 13:41:01 -0000
@@ -143,7 +143,7 @@
 	 * @generated
 	 */
 	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/GridLayout");
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/GridLayout"));
 	}
 
 	/**
Index: plugin.properties
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.edit/plugin.properties,v
retrieving revision 1.7
diff -u -r1.7 plugin.properties
--- plugin.properties	14 Feb 2006 10:11:24 -0000	1.7
+++ plugin.properties	15 Feb 2006 13:40:59 -0000
@@ -285,3 +285,16 @@
 _UI_Layoutable_layoutData_feature = Layout Data
 _UI_DiagramLabel_type = Diagram Label
 _UI_Canvas_labels_feature = Labels
+_UI_FlowLayout_type = Flow Layout
+_UI_XYLayout_type = XY Layout
+_UI_XYLayoutData_type = XY Layout Data
+_UI_StackLayout_type = Stack Layout
+_UI_FlowLayout_vertical_feature = Vertical
+_UI_FlowLayout_matchMinorSize_feature = Match Minor Size
+_UI_FlowLayout_forceSingleLine_feature = Force Single Line
+_UI_FlowLayout_majorAlignment_feature = Major Alignment
+_UI_FlowLayout_minorAlignment_feature = Minor Alignment
+_UI_FlowLayout_majorSpacing_feature = Major Spacing
+_UI_FlowLayout_minorSpacing_feature = Minor Spacing
+_UI_XYLayoutData_topLeft_feature = Top Left
+_UI_XYLayoutData_size_feature = Size
Index: icons/full/ctool16/CreateLayoutable_layout_FlowLayout.gif
===================================================================
RCS file: icons/full/ctool16/CreateLayoutable_layout_FlowLayout.gif
diff -N icons/full/ctool16/CreateLayoutable_layout_FlowLayout.gif
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ icons/full/ctool16/CreateLayoutable_layout_FlowLayout.gif	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,1 @@
+GIF89aÄÿÿÿßß¿??_ÀÀÀŸßŸ€€€@@@ÿÿ_Ÿ_?ÿß?€€€ÀÀÀœœœÒ¦y@@@º—&º—&µ’#®Š¥‚žy™tþýïþýïýóÏýóÏüç£û݃!ù
,\  ŽdY>&™ÍÔе’?ƒŽ’tI3ó4ŒÖk’)'?ciCQ(›§ÈŽ*œÊÉF:,&ßKD8R€›è`ð¢É‡¡`FØ„|Ûm*Ëégol|‚e?‚k%!;
Index: src/org/eclipse/gmf/gmfgraph/provider/FlowLayoutItemProvider.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/provider/FlowLayoutItemProvider.java
diff -N src/org/eclipse/gmf/gmfgraph/provider/FlowLayoutItemProvider.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/provider/FlowLayoutItemProvider.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,282 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+import org.eclipse.gmf.gmfgraph.FlowLayout;
+import org.eclipse.gmf.gmfgraph.GMFGraphPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.gmf.gmfgraph.FlowLayout} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class FlowLayoutItemProvider
+	extends ItemProviderAdapter
+	implements	
+		IEditingDomainItemProvider,	
+		IStructuredItemContentProvider,	
+		ITreeItemContentProvider,	
+		IItemLabelProvider,	
+		IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public FlowLayoutItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public List getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addVerticalPropertyDescriptor(object);
+			addMatchMinorSizePropertyDescriptor(object);
+			addForceSingleLinePropertyDescriptor(object);
+			addMajorAlignmentPropertyDescriptor(object);
+			addMinorAlignmentPropertyDescriptor(object);
+			addMajorSpacingPropertyDescriptor(object);
+			addMinorSpacingPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Vertical feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addVerticalPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_FlowLayout_vertical_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_FlowLayout_vertical_feature", "_UI_FlowLayout_type"),
+				 GMFGraphPackage.eINSTANCE.getFlowLayout_Vertical(),
+				 true,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Match Minor Size feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addMatchMinorSizePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_FlowLayout_matchMinorSize_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_FlowLayout_matchMinorSize_feature", "_UI_FlowLayout_type"),
+				 GMFGraphPackage.eINSTANCE.getFlowLayout_MatchMinorSize(),
+				 true,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Force Single Line feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addForceSingleLinePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_FlowLayout_forceSingleLine_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_FlowLayout_forceSingleLine_feature", "_UI_FlowLayout_type"),
+				 GMFGraphPackage.eINSTANCE.getFlowLayout_ForceSingleLine(),
+				 true,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Major Alignment feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addMajorAlignmentPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_FlowLayout_majorAlignment_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_FlowLayout_majorAlignment_feature", "_UI_FlowLayout_type"),
+				 GMFGraphPackage.eINSTANCE.getFlowLayout_MajorAlignment(),
+				 true,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Minor Alignment feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addMinorAlignmentPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_FlowLayout_minorAlignment_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_FlowLayout_minorAlignment_feature", "_UI_FlowLayout_type"),
+				 GMFGraphPackage.eINSTANCE.getFlowLayout_MinorAlignment(),
+				 true,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Major Spacing feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addMajorSpacingPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_FlowLayout_majorSpacing_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_FlowLayout_majorSpacing_feature", "_UI_FlowLayout_type"),
+				 GMFGraphPackage.eINSTANCE.getFlowLayout_MajorSpacing(),
+				 true,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Minor Spacing feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addMinorSpacingPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_FlowLayout_minorSpacing_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_FlowLayout_minorSpacing_feature", "_UI_FlowLayout_type"),
+				 GMFGraphPackage.eINSTANCE.getFlowLayout_MinorSpacing(),
+				 true,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns FlowLayout.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/FlowLayout"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getText(Object object) {
+		FlowLayout flowLayout = (FlowLayout)object;
+		return getString("_UI_FlowLayout_type") + " " + flowLayout.isVertical();
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(FlowLayout.class)) {
+			case GMFGraphPackage.FLOW_LAYOUT__VERTICAL:
+			case GMFGraphPackage.FLOW_LAYOUT__MATCH_MINOR_SIZE:
+			case GMFGraphPackage.FLOW_LAYOUT__FORCE_SINGLE_LINE:
+			case GMFGraphPackage.FLOW_LAYOUT__MAJOR_ALIGNMENT:
+			case GMFGraphPackage.FLOW_LAYOUT__MINOR_ALIGNMENT:
+			case GMFGraphPackage.FLOW_LAYOUT__MAJOR_SPACING:
+			case GMFGraphPackage.FLOW_LAYOUT__MINOR_SPACING:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
+	 * describing all of the children that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ResourceLocator getResourceLocator() {
+		return GMFGraphEditPlugin.INSTANCE;
+	}
+
+}
Index: icons/full/ctool16/CreateLayoutable_layoutData_XYLayoutData.gif
===================================================================
RCS file: icons/full/ctool16/CreateLayoutable_layoutData_XYLayoutData.gif
diff -N icons/full/ctool16/CreateLayoutable_layoutData_XYLayoutData.gif
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ icons/full/ctool16/CreateLayoutable_layoutData_XYLayoutData.gif	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,1 @@
+GIF89aÄÿÿÿßß¿??_¼Ò茲Ùf™Ì@€Àÿÿ_Ÿ_?ÿß?€€€ÀÀÀœœœÒ¦y@@@º—&º—&µ’#®Š¥‚žy™tþýïþýïýóÏýóÏüç£û݃!ù
,\  ŽdY>&™ÍÔе’?ƒŽ’tI3ó4ŒÖk’)'?ciCQ(›§ÈŽ*œÊÉF:,&ßKD8R€›è`ð¢É‡¡`FØ„|Ûm*Ëégol|‚e?‚k%!;
Index: icons/full/ctool16/CreateXYLayoutData_topLeft_Point.gif
===================================================================
RCS file: icons/full/ctool16/CreateXYLayoutData_topLeft_Point.gif
diff -N icons/full/ctool16/CreateXYLayoutData_topLeft_Point.gif
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ icons/full/ctool16/CreateXYLayoutData_topLeft_Point.gif	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,1 @@
+GIF89aÄÿÿÿßß¿??_ÀÀÀœœœÒÒy@@@ÿÿ_Ÿ_?ÿß?€€€¼Ò茲Ùf™Ì@€Àº—&º—&µ’#®Š¥‚žy™tþýïþýïýóÏýóÏüç£û݃!ù
,\  ŽdY>&™ÍÔе’?ƒŽ’tI3ó4ŒÖk’)'?ciCQ(›§ÈŽ*œÊÉF:,&ßKD8R€›è`ð¢É‡¡`FØ„|Ûm*Ëégol|‚e?‚k%!;
Index: icons/full/ctool16/CreateLayoutable_layout_XYLayout.gif
===================================================================
RCS file: icons/full/ctool16/CreateLayoutable_layout_XYLayout.gif
diff -N icons/full/ctool16/CreateLayoutable_layout_XYLayout.gif
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ icons/full/ctool16/CreateLayoutable_layout_XYLayout.gif	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,1 @@
+GIF89aÄÿÿÿßß¿??_Ö¬‚ÆŒS¬s9†Y,ÿÿ_Ÿ_?ÿß?€€€ÀÀÀœœœÒ¦y@@@º—&º—&µ’#®Š¥‚žy™tþýïþýïýóÏýóÏüç£û݃!ù
,\  ŽdY>&™ÍÔе’?ƒŽ’tI3ó4ŒÖk’)'?ciCQ(›§ÈŽ*œÊÉF:,&ßKD8R€›è`ð¢É‡¡`FØ„|Ûm*Ëégol|‚e?‚k%!;
Index: icons/full/obj16/XYLayoutData.gif
===================================================================
RCS file: icons/full/obj16/XYLayoutData.gif
diff -N icons/full/obj16/XYLayoutData.gif
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ icons/full/obj16/XYLayoutData.gif	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,1 @@
+GIF89a³€€€€ÀÀÀ€€€ÿÿÀÀÀÿÿÿÿÿÿ¼Ò茲Ùf™Ì@€À!ù
	,.0ÉI«½8ëôö$áqE·5Úd`J ¡õ<.ñ–&Õ6wŒ©)-§
‰FÄ‘
;
Index: icons/full/obj16/FlowLayout.gif
===================================================================
RCS file: icons/full/obj16/FlowLayout.gif
diff -N icons/full/obj16/FlowLayout.gif
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ icons/full/obj16/FlowLayout.gif	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,1 @@
+GIF89a³€€€€ÀÀÀ€€€ÿÿÀÀÀÿÿÿÿÿÿÀÀÀŸßŸ€€€@@@!ù
	,.0ÉI«½8ëôö$áqE·5Úd`J ¡õ<.ñ–&Õ6wŒ©)-§
‰FÄ‘
;
Index: src/org/eclipse/gmf/gmfgraph/provider/XYLayoutItemProvider.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/provider/XYLayoutItemProvider.java
diff -N src/org/eclipse/gmf/gmfgraph/provider/XYLayoutItemProvider.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/provider/XYLayoutItemProvider.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,116 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.gmf.gmfgraph.XYLayout} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class XYLayoutItemProvider
+	extends ItemProviderAdapter
+	implements	
+		IEditingDomainItemProvider,	
+		IStructuredItemContentProvider,	
+		ITreeItemContentProvider,	
+		IItemLabelProvider,	
+		IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public XYLayoutItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public List getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This returns XYLayout.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XYLayout"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getText(Object object) {
+		return getString("_UI_XYLayout_type");
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
+	 * describing all of the children that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ResourceLocator getResourceLocator() {
+		return GMFGraphEditPlugin.INSTANCE;
+	}
+
+}
Index: icons/full/obj16/StackLayout.gif
===================================================================
RCS file: icons/full/obj16/StackLayout.gif
diff -N icons/full/obj16/StackLayout.gif
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ icons/full/obj16/StackLayout.gif	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,1 @@
+GIF89a³€€€€ÀÀÀ€€€ÿÿÀÀÀÿÿÿÿÿÿÀÀÀ¿ßŸ€€€@@@!ù
	,.0ÉI«½8ëôö$áqE·5Úd`J ¡õ<.ñ–&Õ6wŒ©)-§
‰FÄ‘
;
Index: icons/full/obj16/XYLayout.gif
===================================================================
RCS file: icons/full/obj16/XYLayout.gif
diff -N icons/full/obj16/XYLayout.gif
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ icons/full/obj16/XYLayout.gif	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,1 @@
+GIF89a³€€€€ÀÀÀ€€€ÿÿÀÀÀÿÿÿÿÿÿÖ¬‚ÆŒS¬s9†Y,!ù
	,.0ÉI«½8ëôö$áqE·5Úd`J ¡õ<.ñ–&Õ6wŒ©)-§
‰FÄ‘
;
Index: src/org/eclipse/gmf/gmfgraph/provider/XYLayoutDataItemProvider.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/provider/XYLayoutDataItemProvider.java
diff -N src/org/eclipse/gmf/gmfgraph/provider/XYLayoutDataItemProvider.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/provider/XYLayoutDataItemProvider.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,191 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+import org.eclipse.gmf.gmfgraph.GMFGraphFactory;
+import org.eclipse.gmf.gmfgraph.GMFGraphPackage;
+import org.eclipse.gmf.gmfgraph.XYLayoutData;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.gmf.gmfgraph.XYLayoutData} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class XYLayoutDataItemProvider
+	extends ItemProviderAdapter
+	implements	
+		IEditingDomainItemProvider,	
+		IStructuredItemContentProvider,	
+		ITreeItemContentProvider,	
+		IItemLabelProvider,	
+		IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public XYLayoutDataItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public List getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addOwnerPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Owner feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addOwnerPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_LayoutData_owner_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_LayoutData_owner_feature", "_UI_LayoutData_type"),
+				 GMFGraphPackage.eINSTANCE.getLayoutData_Owner(),
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Collection getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getXYLayoutData_TopLeft());
+			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getXYLayoutData_Size());
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns XYLayoutData.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XYLayoutData"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getText(Object object) {
+		return getString("_UI_XYLayoutData_type");
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(XYLayoutData.class)) {
+			case GMFGraphPackage.XY_LAYOUT_DATA__TOP_LEFT:
+			case GMFGraphPackage.XY_LAYOUT_DATA__SIZE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
+	 * describing all of the children that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(GMFGraphPackage.eINSTANCE.getXYLayoutData_TopLeft(),
+				 GMFGraphFactory.eINSTANCE.createPoint()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(GMFGraphPackage.eINSTANCE.getXYLayoutData_Size(),
+				 GMFGraphFactory.eINSTANCE.createDimension()));
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ResourceLocator getResourceLocator() {
+		return GMFGraphEditPlugin.INSTANCE;
+	}
+
+}
Index: src/org/eclipse/gmf/gmfgraph/provider/StackLayoutItemProvider.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/provider/StackLayoutItemProvider.java
diff -N src/org/eclipse/gmf/gmfgraph/provider/StackLayoutItemProvider.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/provider/StackLayoutItemProvider.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,116 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.gmf.gmfgraph.StackLayout} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class StackLayoutItemProvider
+	extends ItemProviderAdapter
+	implements	
+		IEditingDomainItemProvider,	
+		IStructuredItemContentProvider,	
+		ITreeItemContentProvider,	
+		IItemLabelProvider,	
+		IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StackLayoutItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public List getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This returns StackLayout.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/StackLayout"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getText(Object object) {
+		return getString("_UI_StackLayout_type");
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
+	 * describing all of the children that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ResourceLocator getResourceLocator() {
+		return GMFGraphEditPlugin.INSTANCE;
+	}
+
+}
Index: icons/full/ctool16/CreateXYLayoutData_size_Dimension.gif
===================================================================
RCS file: icons/full/ctool16/CreateXYLayoutData_size_Dimension.gif
diff -N icons/full/ctool16/CreateXYLayoutData_size_Dimension.gif
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ icons/full/ctool16/CreateXYLayoutData_size_Dimension.gif	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,1 @@
+GIF89aÄÿÿÿßß¿??_ÀÀÀœœœ€€€™3fÿÿ_Ÿ_?ÿß?€€€¼Ò茲Ùf™Ì@€Àº—&º—&µ’#®Š¥‚žy™tþýïþýïýóÏýóÏüç£û݃!ù
,\  ŽdY>&™ÍÔе’?ƒŽ’tI3ó4ŒÖk’)'?ciCQ(›§ÈŽ*œÊÉF:,&ßKD8R€›è`ð¢É‡¡`FØ„|Ûm*Ëégol|‚e?‚k%!;
Index: icons/full/ctool16/CreateLayoutable_layout_StackLayout.gif
===================================================================
RCS file: icons/full/ctool16/CreateLayoutable_layout_StackLayout.gif
diff -N icons/full/ctool16/CreateLayoutable_layout_StackLayout.gif
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ icons/full/ctool16/CreateLayoutable_layout_StackLayout.gif	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,1 @@
+GIF89aÄÿÿÿßß¿??_ÀÀÀ¿ßŸ€€€@@@ÿÿ_Ÿ_?ÿß?€€€ÀÀÀœœœÒ¦y@@@º—&º—&µ’#®Š¥‚žy™tþýïþýïýóÏýóÏüç£û݃!ù
,\  ŽdY>&™ÍÔе’?ƒŽ’tI3ó4ŒÖk’)'?ciCQ(›§ÈŽ*œÊÉF:,&ßKD8R€›è`ð¢É‡¡`FØ„|Ûm*Ëégol|‚e?‚k%!;
#P org.eclipse.gmf.graphdef.codegen
Index: templates/layoutData/BorderLayoutData.javajet
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/templates/layoutData/BorderLayoutData.javajet,v
retrieving revision 1.1
diff -u -r1.1 BorderLayoutData.javajet
--- templates/layoutData/BorderLayoutData.javajet	13 Feb 2006 17:36:17 -0000	1.1
+++ templates/layoutData/BorderLayoutData.javajet	15 Feb 2006 13:41:09 -0000
@@ -36,5 +36,5 @@
 		throw new IllegalArgumentException("Unknown Alignment: " + gmfLayoutData.getAlignment());
 }
 %>
-		<%=figureVarName%>.getParent().getLayoutManager().setConstraint(<%=figureVarName%>, <%=dispatcher.getImportManager().getImportedName("org.eclipse.draw2d.BorderLayout")%>.<%=constantName%>);
+		<%=argsBundle.getManagerVariableName()%>.setConstraint(<%=figureVarName%>, <%=dispatcher.getImportManager().getImportedName("org.eclipse.draw2d.BorderLayout")%>.<%=constantName%>);
 
Index: templates/layoutData/GridLayoutData.javajet
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/templates/layoutData/GridLayoutData.javajet,v
retrieving revision 1.1
diff -u -r1.1 GridLayoutData.javajet
--- templates/layoutData/GridLayoutData.javajet	13 Feb 2006 17:36:17 -0000	1.1
+++ templates/layoutData/GridLayoutData.javajet	15 Feb 2006 13:41:09 -0000
@@ -6,7 +6,8 @@
 final GridLayoutData gmfLayoutData = (GridLayoutData) argsBundle.getData();
 final String figureVarName = argsBundle.getVariableName();
 final GraphDefDispatcher dispatcher = argsBundle.getDispatcher();
-final String layoutConstraintVarName = argsBundle.getLayoutVariableName();
+final String layoutConstraintVarName = argsBundle.getConstraintVariableName();
+final String layoutManagerVarName = argsBundle.getManagerVariableName();
 
 final String layoutImplClassName = dispatcher.getImportManager().getImportedName((String) dispatcher.getFQNSwitch().doSwitch(gmfLayoutData));
 %>
@@ -27,5 +28,5 @@
 			<%=layoutConstraintVarName%>.verticalSpan = <%=gmfLayoutData.getVerticalSpan()%>;
 			<%=layoutConstraintVarName%>.grabExcessHorizontalSpace = <%=gmfLayoutData.isGrabExcessHorizontalSpace()%>;
 			<%=layoutConstraintVarName%>.grabExcessVerticalSpace = <%=gmfLayoutData.isGrabExcessVerticalSpace()%>;
-			<%=figureVarName%>.getParent().getLayoutManager().setConstraint(<%=figureVarName%>, <%=layoutConstraintVarName%>);
+			<%=layoutManagerVarName%>.setConstraint(<%=figureVarName%>, <%=layoutConstraintVarName%>);
 
Index: templates/layoutData/CustomLayoutData.javajet
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/templates/layoutData/CustomLayoutData.javajet,v
retrieving revision 1.1
diff -u -r1.1 CustomLayoutData.javajet
--- templates/layoutData/CustomLayoutData.javajet	13 Feb 2006 17:36:17 -0000	1.1
+++ templates/layoutData/CustomLayoutData.javajet	15 Feb 2006 13:41:09 -0000
@@ -6,5 +6,6 @@
 final GraphDefDispatcher dispatcher = args.getDispatcher();
 final String layoutImplClassName = dispatcher.getImportManager().getImportedName((String) dispatcher.getFQNSwitch().doSwitch(layoutData));
 %>
-<%=layoutImplClassName%> <%=args.getLayoutVariableName()%> = new <%=layoutImplClassName%>();
-<%=dispatcher.dispatch("customAttributes", new Object[] {layoutData, dispatcher, args.getLayoutVariableName()})%>
+<%=layoutImplClassName%> <%=args.getConstraintVariableName()%> = new <%=layoutImplClassName%>();
+<%=dispatcher.dispatch("customAttributes", new Object[] {layoutData, dispatcher, args.getConstraintVariableName()})%>
+<%=args.getManagerVariableName()%>.setConstraint(<%=args.getVariableName()%>, <%=args.getConstraintVariableName()%>);
\ No newline at end of file
Index: templates/layout/BorderLayout.javajet
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/templates/layout/BorderLayout.javajet,v
retrieving revision 1.1
diff -u -r1.1 BorderLayout.javajet
--- templates/layout/BorderLayout.javajet	13 Feb 2006 17:36:17 -0000	1.1
+++ templates/layout/BorderLayout.javajet	15 Feb 2006 13:41:09 -0000
@@ -3,7 +3,7 @@
 <%
 GraphDefDispatcher.LayoutArgs argsBundle = (GraphDefDispatcher.LayoutArgs) argument;
 final BorderLayout gmfLayout = (BorderLayout) argsBundle.getLayout();
-final String layouterVarName = argsBundle.getLayoutVariableName();
+final String layouterVarName = argsBundle.getManagerVariableName();
 %>
 
 <%
Index: templates/layout/CustomLayout.javajet
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/templates/layout/CustomLayout.javajet,v
retrieving revision 1.1
diff -u -r1.1 CustomLayout.javajet
--- templates/layout/CustomLayout.javajet	13 Feb 2006 17:36:17 -0000	1.1
+++ templates/layout/CustomLayout.javajet	15 Feb 2006 13:41:09 -0000
@@ -5,4 +5,4 @@
 final CustomLayout layout = (CustomLayout) argsBundle.getLayout();
 final GraphDefDispatcher dispatcher = argsBundle.getDispatcher();
 %>
-<%=dispatcher.dispatch("customAttributes", new Object[] {layout, dispatcher, argsBundle.getLayoutVariableName()} )%>
+<%=dispatcher.dispatch("customAttributes", new Object[] {layout, dispatcher, argsBundle.getManagerVariableName()} )%>
Index: templates/layout/GridLayout.javajet
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/templates/layout/GridLayout.javajet,v
retrieving revision 1.1
diff -u -r1.1 GridLayout.javajet
--- templates/layout/GridLayout.javajet	13 Feb 2006 17:36:17 -0000	1.1
+++ templates/layout/GridLayout.javajet	15 Feb 2006 13:41:09 -0000
@@ -3,7 +3,7 @@
 <%
 GraphDefDispatcher.LayoutArgs argsBundle = (GraphDefDispatcher.LayoutArgs) argument;
 final GridLayout gmfLayout = (GridLayout) argsBundle.getLayout();
-final String layouterVarName = argsBundle.getLayoutVariableName();
+final String layouterVarName = argsBundle.getManagerVariableName();
 %>
 		<%=layouterVarName%>.numColumns = <%=gmfLayout.getNumColumns()%>;
 		<%=layouterVarName%>.makeColumnsEqualWidth = <%=gmfLayout.isEqualWidth()%>;
Index: src/org/eclipse/gmf/graphdef/codegen/templates/InitGridLayoutDataGenerator.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/templates/InitGridLayoutDataGenerator.java,v
retrieving revision 1.1
diff -u -r1.1 InitGridLayoutDataGenerator.java
--- src/org/eclipse/gmf/graphdef/codegen/templates/InitGridLayoutDataGenerator.java	13 Feb 2006 17:36:17 -0000	1.1
+++ src/org/eclipse/gmf/graphdef/codegen/templates/InitGridLayoutDataGenerator.java	15 Feb 2006 13:41:09 -0000
@@ -39,7 +39,7 @@
   protected final String TEXT_22 = ";" + NL + "\t\t\t";
   protected final String TEXT_23 = ".grabExcessVerticalSpace = ";
   protected final String TEXT_24 = ";" + NL + "\t\t\t";
-  protected final String TEXT_25 = ".getParent().getLayoutManager().setConstraint(";
+  protected final String TEXT_25 = ".setConstraint(";
   protected final String TEXT_26 = ", ";
   protected final String TEXT_27 = ");" + NL;
   protected final String TEXT_28 = NL;
@@ -52,7 +52,8 @@
 final GridLayoutData gmfLayoutData = (GridLayoutData) argsBundle.getData();
 final String figureVarName = argsBundle.getVariableName();
 final GraphDefDispatcher dispatcher = argsBundle.getDispatcher();
-final String layoutConstraintVarName = argsBundle.getLayoutVariableName();
+final String layoutConstraintVarName = argsBundle.getConstraintVariableName();
+final String layoutManagerVarName = argsBundle.getManagerVariableName();
 
 final String layoutImplClassName = dispatcher.getImportManager().getImportedName((String) dispatcher.getFQNSwitch().doSwitch(gmfLayoutData));
 
@@ -108,7 +109,7 @@
     stringBuffer.append(TEXT_23);
     stringBuffer.append(gmfLayoutData.isGrabExcessVerticalSpace());
     stringBuffer.append(TEXT_24);
-    stringBuffer.append(figureVarName);
+    stringBuffer.append(layoutManagerVarName);
     stringBuffer.append(TEXT_25);
     stringBuffer.append(figureVarName);
     stringBuffer.append(TEXT_26);
Index: src/org/eclipse/gmf/graphdef/codegen/templates/InitCustomLayoutDataGenerator.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/templates/InitCustomLayoutDataGenerator.java,v
retrieving revision 1.1
diff -u -r1.1 InitCustomLayoutDataGenerator.java
--- src/org/eclipse/gmf/graphdef/codegen/templates/InitCustomLayoutDataGenerator.java	13 Feb 2006 17:36:17 -0000	1.1
+++ src/org/eclipse/gmf/graphdef/codegen/templates/InitCustomLayoutDataGenerator.java	15 Feb 2006 13:41:09 -0000
@@ -21,6 +21,9 @@
   protected final String TEXT_4 = "();";
   protected final String TEXT_5 = NL;
   protected final String TEXT_6 = NL;
+  protected final String TEXT_7 = ".setConstraint(";
+  protected final String TEXT_8 = ", ";
+  protected final String TEXT_9 = ");";
 
   public String generate(Object argument)
   {
@@ -34,13 +37,19 @@
     stringBuffer.append(TEXT_1);
     stringBuffer.append(layoutImplClassName);
     stringBuffer.append(TEXT_2);
-    stringBuffer.append(args.getLayoutVariableName());
+    stringBuffer.append(args.getConstraintVariableName());
     stringBuffer.append(TEXT_3);
     stringBuffer.append(layoutImplClassName);
     stringBuffer.append(TEXT_4);
     stringBuffer.append(TEXT_5);
-    stringBuffer.append(dispatcher.dispatch("customAttributes", new Object[] {layoutData, dispatcher, args.getLayoutVariableName()}));
+    stringBuffer.append(dispatcher.dispatch("customAttributes", new Object[] {layoutData, dispatcher, args.getConstraintVariableName()}));
     stringBuffer.append(TEXT_6);
+    stringBuffer.append(args.getManagerVariableName());
+    stringBuffer.append(TEXT_7);
+    stringBuffer.append(args.getVariableName());
+    stringBuffer.append(TEXT_8);
+    stringBuffer.append(args.getConstraintVariableName());
+    stringBuffer.append(TEXT_9);
     return stringBuffer.toString();
   }
 }
Index: src/org/eclipse/gmf/graphdef/codegen/templates/NewFigureGenerator.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/templates/NewFigureGenerator.java,v
retrieving revision 1.3
diff -u -r1.3 NewFigureGenerator.java
--- src/org/eclipse/gmf/graphdef/codegen/templates/NewFigureGenerator.java	13 Feb 2006 17:36:17 -0000	1.3
+++ src/org/eclipse/gmf/graphdef/codegen/templates/NewFigureGenerator.java	15 Feb 2006 13:41:09 -0000
@@ -45,7 +45,7 @@
     stringBuffer.append(TEXT_5);
     stringBuffer.append(args.getDispatcher().dispatch(figureInstance, args));
     stringBuffer.append(TEXT_6);
-    stringBuffer.append(args.getDispatcher().dispatch("createLayout", dispatcher.createLayoutArgs(args)));
+    stringBuffer.append(args.getDispatcher().dispatch("createLayout", dispatcher.getLayoutArgsFor(args)));
     stringBuffer.append(TEXT_7);
     return stringBuffer.toString();
   }
Index: src/org/eclipse/gmf/graphdef/codegen/templates/InitBorderLayoutGenerator.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/templates/InitBorderLayoutGenerator.java,v
retrieving revision 1.1
diff -u -r1.1 InitBorderLayoutGenerator.java
--- src/org/eclipse/gmf/graphdef/codegen/templates/InitBorderLayoutGenerator.java	13 Feb 2006 17:36:17 -0000	1.1
+++ src/org/eclipse/gmf/graphdef/codegen/templates/InitBorderLayoutGenerator.java	15 Feb 2006 13:41:09 -0000
@@ -29,7 +29,7 @@
     
 GraphDefDispatcher.LayoutArgs argsBundle = (GraphDefDispatcher.LayoutArgs) argument;
 final BorderLayout gmfLayout = (BorderLayout) argsBundle.getLayout();
-final String layouterVarName = argsBundle.getLayoutVariableName();
+final String layouterVarName = argsBundle.getManagerVariableName();
 
     stringBuffer.append(TEXT_1);
     
Index: src/org/eclipse/gmf/graphdef/codegen/templates/InitGridLayoutGenerator.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/templates/InitGridLayoutGenerator.java,v
retrieving revision 1.1
diff -u -r1.1 InitGridLayoutGenerator.java
--- src/org/eclipse/gmf/graphdef/codegen/templates/InitGridLayoutGenerator.java	13 Feb 2006 17:36:17 -0000	1.1
+++ src/org/eclipse/gmf/graphdef/codegen/templates/InitGridLayoutGenerator.java	15 Feb 2006 13:41:09 -0000
@@ -38,7 +38,7 @@
     
 GraphDefDispatcher.LayoutArgs argsBundle = (GraphDefDispatcher.LayoutArgs) argument;
 final GridLayout gmfLayout = (GridLayout) argsBundle.getLayout();
-final String layouterVarName = argsBundle.getLayoutVariableName();
+final String layouterVarName = argsBundle.getManagerVariableName();
 
     stringBuffer.append(TEXT_1);
     stringBuffer.append(layouterVarName);
Index: src/org/eclipse/gmf/graphdef/codegen/templates/InitCustomLayoutGenerator.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/templates/InitCustomLayoutGenerator.java,v
retrieving revision 1.1
diff -u -r1.1 InitCustomLayoutGenerator.java
--- src/org/eclipse/gmf/graphdef/codegen/templates/InitCustomLayoutGenerator.java	13 Feb 2006 17:36:17 -0000	1.1
+++ src/org/eclipse/gmf/graphdef/codegen/templates/InitCustomLayoutGenerator.java	15 Feb 2006 13:41:09 -0000
@@ -27,7 +27,7 @@
 final GraphDefDispatcher dispatcher = argsBundle.getDispatcher();
 
     stringBuffer.append(TEXT_1);
-    stringBuffer.append(dispatcher.dispatch("customAttributes", new Object[] {layout, dispatcher, argsBundle.getLayoutVariableName()} ));
+    stringBuffer.append(dispatcher.dispatch("customAttributes", new Object[] {layout, dispatcher, argsBundle.getManagerVariableName()} ));
     stringBuffer.append(TEXT_2);
     return stringBuffer.toString();
   }
Index: src/org/eclipse/gmf/graphdef/codegen/templates/TopShapeGenerator.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/templates/TopShapeGenerator.java,v
retrieving revision 1.3
diff -u -r1.3 TopShapeGenerator.java
--- src/org/eclipse/gmf/graphdef/codegen/templates/TopShapeGenerator.java	13 Feb 2006 17:36:17 -0000	1.3
+++ src/org/eclipse/gmf/graphdef/codegen/templates/TopShapeGenerator.java	15 Feb 2006 13:41:09 -0000
@@ -66,7 +66,7 @@
     stringBuffer.append(figure.getName());
     stringBuffer.append(TEXT_5);
     
-GraphDefDispatcher.LayoutArgs dispatcherArgs = dispatcher.createLayoutArgs(figure, "this", "myGenLayoutManager");
+GraphDefDispatcher.LayoutArgs dispatcherArgs = dispatcher.createLayoutArgs(figure, "this", "myGenLayoutManager", null);
 
     stringBuffer.append(TEXT_6);
     stringBuffer.append(dispatcher.dispatch("createLayout", dispatcherArgs));
@@ -87,7 +87,7 @@
     stringBuffer.append(TEXT_12);
     stringBuffer.append(childVarName);
     stringBuffer.append(TEXT_13);
-    stringBuffer.append(dispatcher.dispatch("createLayoutData", dispatcher.createLayoutArgs(next, childVarName, "layout" + next.getName())));
+    stringBuffer.append(dispatcher.dispatch("createLayoutData", dispatcher.createLayoutArgs(next, childVarName, dispatcherArgs.getManagerVariableName(), "layoutData" + next.getName())));
     stringBuffer.append(TEXT_14);
     }
     stringBuffer.append(TEXT_15);
Index: src/org/eclipse/gmf/graphdef/codegen/templates/NewLayoutGenerator.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/templates/NewLayoutGenerator.java,v
retrieving revision 1.1
diff -u -r1.1 NewLayoutGenerator.java
--- src/org/eclipse/gmf/graphdef/codegen/templates/NewLayoutGenerator.java	13 Feb 2006 17:36:17 -0000	1.1
+++ src/org/eclipse/gmf/graphdef/codegen/templates/NewLayoutGenerator.java	15 Feb 2006 13:41:09 -0000
@@ -32,7 +32,7 @@
 GraphDefDispatcher.LayoutArgs argsBundle = (GraphDefDispatcher.LayoutArgs) argument;
 final FigureMarker figureMarker = argsBundle.getFigure();
 final String figureVarName = argsBundle.getVariableName();
-final String layouterVarName = argsBundle.getLayoutVariableName();
+final String layouterVarName = argsBundle.getManagerVariableName();
 final GraphDefDispatcher dispatcher = argsBundle.getDispatcher();
 
     stringBuffer.append(TEXT_1);
Index: src/org/eclipse/gmf/graphdef/codegen/templates/FigureChildrenGenerator.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/templates/FigureChildrenGenerator.java,v
retrieving revision 1.3
diff -u -r1.3 FigureChildrenGenerator.java
--- src/org/eclipse/gmf/graphdef/codegen/templates/FigureChildrenGenerator.java	13 Feb 2006 17:36:17 -0000	1.3
+++ src/org/eclipse/gmf/graphdef/codegen/templates/FigureChildrenGenerator.java	15 Feb 2006 13:41:09 -0000
@@ -51,18 +51,20 @@
 		throw new IllegalStateException("FIXME: sorry, don't support FigureRef for a while");
 	}
 	final String figureVarName = "fig" + figureCount;
+	final String layoutManagerVarName = "layouter" + figureCount;
 	final String layoutDataVarName = "layData" + figureCount;
 	figureCount++;
     stringBuffer.append(TEXT_2);
     GraphDefDispatcher.Args dargs = dispatcher.create((Figure) figureMarker, figureVarName);
+		GraphDefDispatcher.LayoutArgs layoutAwareArgs = dispatcher.createLayoutArgs(dargs, layoutManagerVarName, layoutDataVarName);
     stringBuffer.append(TEXT_3);
-    stringBuffer.append(dispatcher.dispatch("instantiate", dargs));
+    stringBuffer.append(dispatcher.dispatch("instantiate", layoutAwareArgs));
     stringBuffer.append(TEXT_4);
     stringBuffer.append(parentFigureVarName);
     stringBuffer.append(TEXT_5);
     stringBuffer.append(figureVarName);
     stringBuffer.append(TEXT_6);
-    stringBuffer.append(dispatcher.dispatch("createLayoutData", dispatcher.createLayoutArgs(dargs, layoutDataVarName)));
+    stringBuffer.append(dispatcher.dispatch("createLayoutData", layoutAwareArgs));
     
 if (_nxt instanceof Figure && !((Figure) _nxt).getChildren().isEmpty()) {
 	l.addFirst(marker);
Index: src/org/eclipse/gmf/graphdef/codegen/templates/InitBorderLayoutDataGenerator.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/templates/InitBorderLayoutDataGenerator.java,v
retrieving revision 1.1
diff -u -r1.1 InitBorderLayoutDataGenerator.java
--- src/org/eclipse/gmf/graphdef/codegen/templates/InitBorderLayoutDataGenerator.java	13 Feb 2006 17:36:17 -0000	1.1
+++ src/org/eclipse/gmf/graphdef/codegen/templates/InitBorderLayoutDataGenerator.java	15 Feb 2006 13:41:09 -0000
@@ -17,7 +17,7 @@
   protected final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
   protected final String TEXT_1 = "";
   protected final String TEXT_2 = NL + "\t\t";
-  protected final String TEXT_3 = ".getParent().getLayoutManager().setConstraint(";
+  protected final String TEXT_3 = ".setConstraint(";
   protected final String TEXT_4 = ", ";
   protected final String TEXT_5 = ".";
   protected final String TEXT_6 = ");" + NL;
@@ -63,7 +63,7 @@
 }
 
     stringBuffer.append(TEXT_2);
-    stringBuffer.append(figureVarName);
+    stringBuffer.append(argsBundle.getManagerVariableName());
     stringBuffer.append(TEXT_3);
     stringBuffer.append(figureVarName);
     stringBuffer.append(TEXT_4);
Index: src/org/eclipse/gmf/graphdef/codegen/FigureGenerator.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/FigureGenerator.java,v
retrieving revision 1.8
diff -u -r1.8 FigureGenerator.java
--- src/org/eclipse/gmf/graphdef/codegen/FigureGenerator.java	13 Feb 2006 17:36:17 -0000	1.8
+++ src/org/eclipse/gmf/graphdef/codegen/FigureGenerator.java	15 Feb 2006 13:41:09 -0000
@@ -20,6 +20,7 @@
 import org.eclipse.gmf.gmfgraph.CustomLayout;
 import org.eclipse.gmf.gmfgraph.CustomLayoutData;
 import org.eclipse.gmf.gmfgraph.Figure;
+import org.eclipse.gmf.gmfgraph.FlowLayout;
 import org.eclipse.gmf.gmfgraph.GridLayout;
 import org.eclipse.gmf.gmfgraph.GridLayoutData;
 import org.eclipse.gmf.gmfgraph.Label;
@@ -29,6 +30,9 @@
 import org.eclipse.gmf.gmfgraph.PolylineDecoration;
 import org.eclipse.gmf.gmfgraph.RoundedRectangle;
 import org.eclipse.gmf.gmfgraph.Shape;
+import org.eclipse.gmf.gmfgraph.StackLayout;
+import org.eclipse.gmf.gmfgraph.XYLayout;
+import org.eclipse.gmf.gmfgraph.XYLayoutData;
 import org.eclipse.gmf.gmfgraph.util.FigureQualifiedNameSwitch;
 import org.eclipse.gmf.gmfgraph.util.GMFGraphSwitch;
 import org.eclipse.gmf.graphdef.codegen.templates.CustomClassAttributesGenerator;
@@ -38,8 +42,12 @@
 import org.eclipse.gmf.graphdef.codegen.templates.InitBorderLayoutGenerator;
 import org.eclipse.gmf.graphdef.codegen.templates.InitCustomLayoutDataGenerator;
 import org.eclipse.gmf.graphdef.codegen.templates.InitCustomLayoutGenerator;
+import org.eclipse.gmf.graphdef.codegen.templates.InitFlowLayoutGenerator;
 import org.eclipse.gmf.graphdef.codegen.templates.InitGridLayoutDataGenerator;
 import org.eclipse.gmf.graphdef.codegen.templates.InitGridLayoutGenerator;
+import org.eclipse.gmf.graphdef.codegen.templates.InitStackLayoutGenerator;
+import org.eclipse.gmf.graphdef.codegen.templates.InitXYLayoutDataGenerator;
+import org.eclipse.gmf.graphdef.codegen.templates.InitXYLayoutGenerator;
 import org.eclipse.gmf.graphdef.codegen.templates.LabelAttrGenerator;
 import org.eclipse.gmf.graphdef.codegen.templates.NewFigureGenerator;
 import org.eclipse.gmf.graphdef.codegen.templates.NewLayoutDataGenerator;
@@ -147,11 +155,15 @@
 		tr.put(GridLayout.class, "/templates/layout/GridLayout.javajet", InitGridLayoutGenerator.class);
 		tr.put(BorderLayout.class, "/templates/layout/BorderLayout.javajet", InitBorderLayoutGenerator.class);
 		tr.put(CustomLayout.class, "/templates/layout/CustomLayout.javajet", InitCustomLayoutGenerator.class);
+		tr.put(XYLayout.class, "/templates/layout/XYLayout.javajet", InitXYLayoutGenerator.class);
+		tr.put(StackLayout.class, "/templates/layout/StackLayout.javajet", InitStackLayoutGenerator.class);
+		tr.put(FlowLayout.class, "/templates/layout/FlowLayout.javajet", InitFlowLayoutGenerator.class);
 		
 		tr.put("createLayoutData", "/templates/new/LayoutData.javajet", NewLayoutDataGenerator.class);
 		tr.put(GridLayoutData.class, "/templates/layoutData/GridLayoutData.javajet", InitGridLayoutDataGenerator.class);
 		tr.put(BorderLayoutData.class, "/templates/layoutData/BorderLayoutData.javajet", InitBorderLayoutDataGenerator.class);
 		tr.put(CustomLayoutData.class, "/templates/layoutData/CustomLayoutData.javajet", InitCustomLayoutDataGenerator.class);
+		tr.put(XYLayoutData.class, "/templates/layoutData/XYLayoutData.javajet", InitXYLayoutDataGenerator.class);
 		return tr;
 	}
 
Index: src/org/eclipse/gmf/graphdef/codegen/GraphDefDispatcher.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/GraphDefDispatcher.java,v
retrieving revision 1.2
diff -u -r1.2 GraphDefDispatcher.java
--- src/org/eclipse/gmf/graphdef/codegen/GraphDefDispatcher.java	13 Feb 2006 17:36:17 -0000	1.2
+++ src/org/eclipse/gmf/graphdef/codegen/GraphDefDispatcher.java	15 Feb 2006 13:41:09 -0000
@@ -45,16 +45,16 @@
 		return new Args(this, figure, figureVarName);
 	}
 
-	public LayoutArgs createLayoutArgs(Args inherit, String layoutVarName) {
-		return new LayoutArgs(inherit, layoutVarName);
+	public LayoutArgs getLayoutArgsFor(Args prototype) {
+		return prototype instanceof LayoutArgs ? (LayoutArgs)prototype : new LayoutArgs(prototype);
 	}
 
-	public LayoutArgs createLayoutArgs(Args inherit) {
-		return new LayoutArgs(inherit);
+	public LayoutArgs createLayoutArgs(Figure figure, String figureVarName, String managerVarName, String constraintVarName) {
+		return new LayoutArgs(this, figure, figureVarName, managerVarName, constraintVarName);
 	}
 
-	public LayoutArgs createLayoutArgs(Figure figure, String figureVarName, String layoutVarName) {
-		return new LayoutArgs(this, figure, figureVarName, layoutVarName);
+	public LayoutArgs createLayoutArgs(Args inherit, String managerVarName, String constraintVarName) {
+		return new LayoutArgs(inherit, managerVarName, constraintVarName);
 	}
 
 	public static class Args {
@@ -87,25 +87,31 @@
 
 	public static class LayoutArgs extends Args {
 		private final String myLayoutVariableName;
+		private final String myLayoutDataVariableName;
 
 		/**
-		 * @param layoutVariableName
-		 *            may be either name of layout manager or figure constraint,
-		 *            because there are no contexts requiring both of names in the
-		 *            same time
+		 * @param managerVariableName
+		 *            name of layout manager variable defined somewhere in the
+		 *            generated code, should not be <code>null</code>
+		 * @param constraintVariableName
+		 *            optional name of the layout constraint variable, or
+		 *            <code>null</code> if current context does not contain
+		 *            constraint information.
 		 */
-		public LayoutArgs(Args inherit, String layoutVariableName) {
-			super(inherit);
-			myLayoutVariableName = layoutVariableName;
+		private LayoutArgs(GraphDefDispatcher owner, Figure figure, String figureVarName, String managerVariableName, String constraintVariableName) {
+			super(owner, figure, figureVarName);
+			myLayoutVariableName = managerVariableName;
+			myLayoutDataVariableName = constraintVariableName;
 		}
 
-		public LayoutArgs(Args args) {
-			this(args, args.getVariableName() + "Layout");
+		private LayoutArgs(Args inherit, String managerVariableName, String constraintVariableName) {
+			super(inherit);
+			myLayoutVariableName = managerVariableName;
+			myLayoutDataVariableName = constraintVariableName;
 		}
 
-		public LayoutArgs(GraphDefDispatcher owner, Figure figure, String figureVarName, String layoutVarName) {
-			super(owner, figure, figureVarName);
-			myLayoutVariableName = layoutVarName;
+		private LayoutArgs(Args args) {
+			this(args, args.getVariableName() + "Layouter", args.getVariableName() + "Constraint");
 		}
 
 		public Layout getLayout() {
@@ -116,8 +122,12 @@
 			return getFigure().getLayoutData();
 		}
 
-		public String getLayoutVariableName() {
+		public String getManagerVariableName() {
 			return myLayoutVariableName;
 		}
+		
+		public String getConstraintVariableName() {
+			return myLayoutDataVariableName;
+		}
 	}
 }
Index: templates/top/Shape.javajet
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/templates/top/Shape.javajet,v
retrieving revision 1.3
diff -u -r1.3 Shape.javajet
--- templates/top/Shape.javajet	13 Feb 2006 17:36:17 -0000	1.3
+++ templates/top/Shape.javajet	15 Feb 2006 13:41:09 -0000
@@ -19,7 +19,7 @@
 	 */
 	public <%=figure.getName()%>() {
 <%
-GraphDefDispatcher.LayoutArgs dispatcherArgs = dispatcher.createLayoutArgs(figure, "this", "myGenLayoutManager");
+GraphDefDispatcher.LayoutArgs dispatcherArgs = dispatcher.createLayoutArgs(figure, "this", "myGenLayoutManager", null);
 %>	
 		<%=dispatcher.dispatch("createLayout", dispatcherArgs)%>
 		<%=dispatcher.dispatch(figure, dispatcherArgs)%>
@@ -31,7 +31,7 @@
 		org.eclipse.draw2d.IFigure <%=childVarName%> = createFigure<%=next.getName()%>();
 		setFigure<%=next.getName()%>(<%=childVarName%>);
 		add(<%=childVarName%>);
-		<%=dispatcher.dispatch("createLayoutData", dispatcher.createLayoutArgs(next, childVarName, "layout" + next.getName()))%>		
+		<%=dispatcher.dispatch("createLayoutData", dispatcher.createLayoutArgs(next, childVarName, dispatcherArgs.getManagerVariableName(), "layoutData" + next.getName()))%>		
 <%}%>
 	}
 
Index: templates/children/Figure.javajet
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/templates/children/Figure.javajet,v
retrieving revision 1.3
diff -u -r1.3 Figure.javajet
--- templates/children/Figure.javajet	13 Feb 2006 17:36:17 -0000	1.3
+++ templates/children/Figure.javajet	15 Feb 2006 13:41:09 -0000
@@ -24,13 +24,15 @@
 		throw new IllegalStateException("FIXME: sorry, don't support FigureRef for a while");
 	}
 	final String figureVarName = "fig" + figureCount;
+	final String layoutManagerVarName = "layouter" + figureCount;
 	final String layoutDataVarName = "layData" + figureCount;
 	figureCount++;%>
 		// FIXME instantiate - FigureRef - dispatch to 'instantiate' template?
-		<%GraphDefDispatcher.Args dargs = dispatcher.create((Figure) figureMarker, figureVarName);%>
-		<%=dispatcher.dispatch("instantiate", dargs)%>
+		<%GraphDefDispatcher.Args dargs = dispatcher.create((Figure) figureMarker, figureVarName);
+		GraphDefDispatcher.LayoutArgs layoutAwareArgs = dispatcher.createLayoutArgs(dargs, layoutManagerVarName, layoutDataVarName);%>
+		<%=dispatcher.dispatch("instantiate", layoutAwareArgs)%>
 		<%=parentFigureVarName%>.add(<%=figureVarName%>);
-		<%=dispatcher.dispatch("createLayoutData", dispatcher.createLayoutArgs(dargs, layoutDataVarName))%>
+		<%=dispatcher.dispatch("createLayoutData", layoutAwareArgs)%>
 <%
 if (_nxt instanceof Figure && !((Figure) _nxt).getChildren().isEmpty()) {
 	l.addFirst(marker);
Index: templates/new/Figure.javajet
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/templates/new/Figure.javajet,v
retrieving revision 1.3
diff -u -r1.3 Figure.javajet
--- templates/new/Figure.javajet	13 Feb 2006 17:36:17 -0000	1.3
+++ templates/new/Figure.javajet	15 Feb 2006 13:41:09 -0000
@@ -11,4 +11,4 @@
 %>
 <%=figureClassName%> <%=figureVarName%> = new <%=figureClassName%>();
 <%=args.getDispatcher().dispatch(figureInstance, args)%>
-<%=args.getDispatcher().dispatch("createLayout", dispatcher.createLayoutArgs(args))%>
+<%=args.getDispatcher().dispatch("createLayout", dispatcher.getLayoutArgsFor(args))%>
Index: templates/new/Layout.javajet
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/templates/new/Layout.javajet,v
retrieving revision 1.1
diff -u -r1.1 Layout.javajet
--- templates/new/Layout.javajet	13 Feb 2006 17:36:17 -0000	1.1
+++ templates/new/Layout.javajet	15 Feb 2006 13:41:09 -0000
@@ -4,7 +4,7 @@
 GraphDefDispatcher.LayoutArgs argsBundle = (GraphDefDispatcher.LayoutArgs) argument;
 final FigureMarker figureMarker = argsBundle.getFigure();
 final String figureVarName = argsBundle.getVariableName();
-final String layouterVarName = argsBundle.getLayoutVariableName();
+final String layouterVarName = argsBundle.getManagerVariableName();
 final GraphDefDispatcher dispatcher = argsBundle.getDispatcher();
 %>
 
Index: src/org/eclipse/gmf/graphdef/codegen/templates/InitFlowLayoutGenerator.java
===================================================================
RCS file: src/org/eclipse/gmf/graphdef/codegen/templates/InitFlowLayoutGenerator.java
diff -N src/org/eclipse/gmf/graphdef/codegen/templates/InitFlowLayoutGenerator.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/graphdef/codegen/templates/InitFlowLayoutGenerator.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,117 @@
+package org.eclipse.gmf.graphdef.codegen.templates;
+
+import org.eclipse.gmf.gmfgraph.*;
+import org.eclipse.gmf.graphdef.codegen.*;
+
+public class InitFlowLayoutGenerator
+{
+  protected static String nl;
+  public static synchronized InitFlowLayoutGenerator create(String lineSeparator)
+  {
+    nl = lineSeparator;
+    InitFlowLayoutGenerator result = new InitFlowLayoutGenerator();
+    nl = null;
+    return result;
+  }
+
+  protected final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
+  protected final String TEXT_1 = "\t\t";
+  protected final String TEXT_2 = ".setStretchMinorAxis(";
+  protected final String TEXT_3 = ");" + NL + "\t\t";
+  protected final String TEXT_4 = ".setMinorAlignment(";
+  protected final String TEXT_5 = ");";
+  protected final String TEXT_6 = "\t\t" + NL + "\t\t";
+  protected final String TEXT_7 = ".setSpacing(";
+  protected final String TEXT_8 = ");" + NL + "\t\t";
+  protected final String TEXT_9 = ".setVertical(";
+  protected final String TEXT_10 = ");";
+  protected final String TEXT_11 = NL + "\t\t";
+  protected final String TEXT_12 = ".setMajorAlignment(";
+  protected final String TEXT_13 = ");" + NL + "\t\t";
+  protected final String TEXT_14 = ".setMajorSpacing(";
+  protected final String TEXT_15 = ");" + NL + "\t\t";
+  protected final String TEXT_16 = ".setMinorSpacing(";
+  protected final String TEXT_17 = ");" + NL + "\t\t";
+  protected final String TEXT_18 = ".setHorizontal(";
+  protected final String TEXT_19 = ");";
+  protected final String TEXT_20 = NL + NL;
+  protected final String TEXT_21 = NL;
+
+  public String generate(Object argument)
+  {
+    StringBuffer stringBuffer = new StringBuffer();
+    
+GraphDefDispatcher.LayoutArgs argsBundle = (GraphDefDispatcher.LayoutArgs) argument;
+final FlowLayout gmfLayout = (FlowLayout) argsBundle.getLayout();
+final String layouterVarName = argsBundle.getManagerVariableName();
+
+class AlignmentConverter {
+	public String convert(Alignment alignment){
+		if (alignment == null){
+			alignment = Alignment.BEGINNING_LITERAL;
+		}
+		switch (alignment.getValue()){
+			case Alignment.BEGINNING : 
+				return "ALIGN_LEFTTOP";
+			case Alignment.END :
+				return "ALIGN_RIGHTBOTTOM";
+			case Alignment.FILL:
+			case Alignment.CENTER:
+				return "ALIGN_CENTER";
+			default:
+				throw new IllegalArgumentException("Unknown alignment: " + alignment);
+		}
+	}
+}
+
+final AlignmentConverter alignmentConverter = new AlignmentConverter();
+
+    stringBuffer.append(TEXT_1);
+    stringBuffer.append(layouterVarName);
+    stringBuffer.append(TEXT_2);
+    stringBuffer.append(gmfLayout.isMatchMinorSize());
+    stringBuffer.append(TEXT_3);
+    stringBuffer.append(layouterVarName);
+    stringBuffer.append(TEXT_4);
+    stringBuffer.append(alignmentConverter.convert(gmfLayout.getMinorAlignment()));
+    stringBuffer.append(TEXT_5);
+    
+if (gmfLayout.isForceSingleLine()){
+
+    stringBuffer.append(TEXT_6);
+    stringBuffer.append(layouterVarName);
+    stringBuffer.append(TEXT_7);
+    stringBuffer.append(gmfLayout.getMajorSpacing());
+    stringBuffer.append(TEXT_8);
+    stringBuffer.append(layouterVarName);
+    stringBuffer.append(TEXT_9);
+    stringBuffer.append(gmfLayout.isVertical());
+    stringBuffer.append(TEXT_10);
+    
+} else {
+
+    stringBuffer.append(TEXT_11);
+    stringBuffer.append(layouterVarName);
+    stringBuffer.append(TEXT_12);
+    stringBuffer.append(alignmentConverter.convert(gmfLayout.getMajorAlignment()));
+    stringBuffer.append(TEXT_13);
+    stringBuffer.append(layouterVarName);
+    stringBuffer.append(TEXT_14);
+    stringBuffer.append(gmfLayout.getMajorSpacing());
+    stringBuffer.append(TEXT_15);
+    stringBuffer.append(layouterVarName);
+    stringBuffer.append(TEXT_16);
+    stringBuffer.append(gmfLayout.getMinorSpacing());
+    stringBuffer.append(TEXT_17);
+    stringBuffer.append(layouterVarName);
+    stringBuffer.append(TEXT_18);
+    stringBuffer.append(!gmfLayout.isVertical());
+    stringBuffer.append(TEXT_19);
+    
+} 
+
+    stringBuffer.append(TEXT_20);
+    stringBuffer.append(TEXT_21);
+    return stringBuffer.toString();
+  }
+}
Index: templates/layoutData/XYLayoutData.javajet
===================================================================
RCS file: templates/layoutData/XYLayoutData.javajet
diff -N templates/layoutData/XYLayoutData.javajet
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ templates/layoutData/XYLayoutData.javajet	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,33 @@
+
+<%@ jet package="org.eclipse.gmf.graphdef.codegen.templates" class="InitXYLayoutDataGenerator"
+	imports="org.eclipse.gmf.gmfgraph.* org.eclipse.gmf.graphdef.codegen.*"%>
+<%
+GraphDefDispatcher.LayoutArgs argsBundle = (GraphDefDispatcher.LayoutArgs) argument;
+final XYLayoutData gmfLayoutData = (XYLayoutData) argsBundle.getData();
+final String figureVarName = argsBundle.getVariableName();
+final GraphDefDispatcher dispatcher = argsBundle.getDispatcher();
+final String layoutConstraintVarName = argsBundle.getConstraintVariableName();
+final String layoutManagerVarName = argsBundle.getManagerVariableName();
+
+final String layoutImplClassName = dispatcher.getImportManager().getImportedName((String) dispatcher.getFQNSwitch().doSwitch(gmfLayoutData));
+%>
+			<%=layoutImplClassName%> <%=layoutConstraintVarName%> = new <%=layoutImplClassName%>();
+<%
+Point topLeft = gmfLayoutData.getTopLeft();
+if (topLeft != null){
+%>
+			<%=layoutConstraintVarName%>.x = <%=topLeft.getX()%>;
+			<%=layoutConstraintVarName%>.y = <%=topLeft.getY()%>;
+<%
+}
+%>
+<%
+Dimension size = gmfLayoutData.getSize();
+if (size != null){
+%>
+			<%=layoutConstraintVarName%>.width = <%=size.getDx()%>;
+			<%=layoutConstraintVarName%>.height = <%=size.getDy()%>;
+<%
+}
+%>
+			<%=layoutManagerVarName%>.setConstraint(<%=figureVarName%>, <%=layoutConstraintVarName%>);
Index: templates/layout/XYLayout.javajet
===================================================================
RCS file: templates/layout/XYLayout.javajet
diff -N templates/layout/XYLayout.javajet
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ templates/layout/XYLayout.javajet	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,4 @@
+<%@ jet package="org.eclipse.gmf.graphdef.codegen.templates" class="InitXYLayoutGenerator"%>
+<%
+// no special initialization required
+%>
Index: src/org/eclipse/gmf/graphdef/codegen/templates/InitXYLayoutGenerator.java
===================================================================
RCS file: src/org/eclipse/gmf/graphdef/codegen/templates/InitXYLayoutGenerator.java
diff -N src/org/eclipse/gmf/graphdef/codegen/templates/InitXYLayoutGenerator.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/graphdef/codegen/templates/InitXYLayoutGenerator.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,23 @@
+package org.eclipse.gmf.graphdef.codegen.templates;
+
+public class InitXYLayoutGenerator
+{
+  protected static String nl;
+  public static synchronized InitXYLayoutGenerator create(String lineSeparator)
+  {
+    nl = lineSeparator;
+    InitXYLayoutGenerator result = new InitXYLayoutGenerator();
+    nl = null;
+    return result;
+  }
+
+  protected final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
+  public String generate(Object argument)
+  {
+    StringBuffer stringBuffer = new StringBuffer();
+    
+// no special initialization required
+
+    return stringBuffer.toString();
+  }
+}
Index: src/org/eclipse/gmf/graphdef/codegen/templates/InitStackLayoutGenerator.java
===================================================================
RCS file: src/org/eclipse/gmf/graphdef/codegen/templates/InitStackLayoutGenerator.java
diff -N src/org/eclipse/gmf/graphdef/codegen/templates/InitStackLayoutGenerator.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/graphdef/codegen/templates/InitStackLayoutGenerator.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,23 @@
+package org.eclipse.gmf.graphdef.codegen.templates;
+
+public class InitStackLayoutGenerator
+{
+  protected static String nl;
+  public static synchronized InitStackLayoutGenerator create(String lineSeparator)
+  {
+    nl = lineSeparator;
+    InitStackLayoutGenerator result = new InitStackLayoutGenerator();
+    nl = null;
+    return result;
+  }
+
+  protected final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
+  public String generate(Object argument)
+  {
+    StringBuffer stringBuffer = new StringBuffer();
+    
+// nothing to do
+
+    return stringBuffer.toString();
+  }
+}
Index: templates/layout/FlowLayout.javajet
===================================================================
RCS file: templates/layout/FlowLayout.javajet
diff -N templates/layout/FlowLayout.javajet
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ templates/layout/FlowLayout.javajet	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,47 @@
+<%@ jet package="org.eclipse.gmf.graphdef.codegen.templates" class="InitFlowLayoutGenerator"
+	imports="org.eclipse.gmf.gmfgraph.* org.eclipse.gmf.graphdef.codegen.*"%>
+<%
+GraphDefDispatcher.LayoutArgs argsBundle = (GraphDefDispatcher.LayoutArgs) argument;
+final FlowLayout gmfLayout = (FlowLayout) argsBundle.getLayout();
+final String layouterVarName = argsBundle.getManagerVariableName();
+
+class AlignmentConverter {
+	public String convert(Alignment alignment){
+		if (alignment == null){
+			alignment = Alignment.BEGINNING_LITERAL;
+		}
+		switch (alignment.getValue()){
+			case Alignment.BEGINNING : 
+				return "ALIGN_LEFTTOP";
+			case Alignment.END :
+				return "ALIGN_RIGHTBOTTOM";
+			case Alignment.FILL:
+			case Alignment.CENTER:
+				return "ALIGN_CENTER";
+			default:
+				throw new IllegalArgumentException("Unknown alignment: " + alignment);
+		}
+	}
+}
+
+final AlignmentConverter alignmentConverter = new AlignmentConverter();
+%>
+		<%=layouterVarName%>.setStretchMinorAxis(<%=gmfLayout.isMatchMinorSize()%>);
+		<%=layouterVarName%>.setMinorAlignment(<%=alignmentConverter.convert(gmfLayout.getMinorAlignment())%>);
+<%
+if (gmfLayout.isForceSingleLine()){
+%>		
+		<%=layouterVarName%>.setSpacing(<%=gmfLayout.getMajorSpacing()%>);
+		<%=layouterVarName%>.setVertical(<%=gmfLayout.isVertical()%>);
+<%
+} else {
+%>
+		<%=layouterVarName%>.setMajorAlignment(<%=alignmentConverter.convert(gmfLayout.getMajorAlignment())%>);
+		<%=layouterVarName%>.setMajorSpacing(<%=gmfLayout.getMajorSpacing()%>);
+		<%=layouterVarName%>.setMinorSpacing(<%=gmfLayout.getMinorSpacing()%>);
+		<%=layouterVarName%>.setHorizontal(<%=!gmfLayout.isVertical()%>);
+<%
+} 
+%>
+
+
Index: src/org/eclipse/gmf/graphdef/codegen/templates/InitXYLayoutDataGenerator.java
===================================================================
RCS file: src/org/eclipse/gmf/graphdef/codegen/templates/InitXYLayoutDataGenerator.java
diff -N src/org/eclipse/gmf/graphdef/codegen/templates/InitXYLayoutDataGenerator.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/graphdef/codegen/templates/InitXYLayoutDataGenerator.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,100 @@
+package org.eclipse.gmf.graphdef.codegen.templates;
+
+import org.eclipse.gmf.gmfgraph.*;
+import org.eclipse.gmf.graphdef.codegen.*;
+
+public class InitXYLayoutDataGenerator
+{
+  protected static String nl;
+  public static synchronized InitXYLayoutDataGenerator create(String lineSeparator)
+  {
+    nl = lineSeparator;
+    InitXYLayoutDataGenerator result = new InitXYLayoutDataGenerator();
+    nl = null;
+    return result;
+  }
+
+  protected final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
+  protected final String TEXT_1 = "\t\t\t";
+  protected final String TEXT_2 = " ";
+  protected final String TEXT_3 = " = new ";
+  protected final String TEXT_4 = "();";
+  protected final String TEXT_5 = NL + "\t\t\t";
+  protected final String TEXT_6 = ".x = ";
+  protected final String TEXT_7 = ";" + NL + "\t\t\t";
+  protected final String TEXT_8 = ".y = ";
+  protected final String TEXT_9 = ";";
+  protected final String TEXT_10 = NL + "\t\t\t";
+  protected final String TEXT_11 = ".width = ";
+  protected final String TEXT_12 = ";" + NL + "\t\t\t";
+  protected final String TEXT_13 = ".height = ";
+  protected final String TEXT_14 = ";";
+  protected final String TEXT_15 = NL + "\t\t\t";
+  protected final String TEXT_16 = ".setConstraint(";
+  protected final String TEXT_17 = ", ";
+  protected final String TEXT_18 = ");";
+  protected final String TEXT_19 = NL;
+
+  public String generate(Object argument)
+  {
+    StringBuffer stringBuffer = new StringBuffer();
+    
+GraphDefDispatcher.LayoutArgs argsBundle = (GraphDefDispatcher.LayoutArgs) argument;
+final XYLayoutData gmfLayoutData = (XYLayoutData) argsBundle.getData();
+final String figureVarName = argsBundle.getVariableName();
+final GraphDefDispatcher dispatcher = argsBundle.getDispatcher();
+final String layoutConstraintVarName = argsBundle.getConstraintVariableName();
+final String layoutManagerVarName = argsBundle.getManagerVariableName();
+
+final String layoutImplClassName = dispatcher.getImportManager().getImportedName((String) dispatcher.getFQNSwitch().doSwitch(gmfLayoutData));
+
+    stringBuffer.append(TEXT_1);
+    stringBuffer.append(layoutImplClassName);
+    stringBuffer.append(TEXT_2);
+    stringBuffer.append(layoutConstraintVarName);
+    stringBuffer.append(TEXT_3);
+    stringBuffer.append(layoutImplClassName);
+    stringBuffer.append(TEXT_4);
+    
+Point topLeft = gmfLayoutData.getTopLeft();
+if (topLeft != null){
+
+    stringBuffer.append(TEXT_5);
+    stringBuffer.append(layoutConstraintVarName);
+    stringBuffer.append(TEXT_6);
+    stringBuffer.append(topLeft.getX());
+    stringBuffer.append(TEXT_7);
+    stringBuffer.append(layoutConstraintVarName);
+    stringBuffer.append(TEXT_8);
+    stringBuffer.append(topLeft.getY());
+    stringBuffer.append(TEXT_9);
+    
+}
+
+    
+Dimension size = gmfLayoutData.getSize();
+if (size != null){
+
+    stringBuffer.append(TEXT_10);
+    stringBuffer.append(layoutConstraintVarName);
+    stringBuffer.append(TEXT_11);
+    stringBuffer.append(size.getDx());
+    stringBuffer.append(TEXT_12);
+    stringBuffer.append(layoutConstraintVarName);
+    stringBuffer.append(TEXT_13);
+    stringBuffer.append(size.getDy());
+    stringBuffer.append(TEXT_14);
+    
+}
+
+    stringBuffer.append(TEXT_15);
+    stringBuffer.append(layoutManagerVarName);
+    stringBuffer.append(TEXT_16);
+    stringBuffer.append(figureVarName);
+    stringBuffer.append(TEXT_17);
+    stringBuffer.append(layoutConstraintVarName);
+    stringBuffer.append(TEXT_18);
+    stringBuffer.append(TEXT_19);
+    return stringBuffer.toString();
+  }
+}
Index: templates/layout/StackLayout.javajet
===================================================================
RCS file: templates/layout/StackLayout.javajet
diff -N templates/layout/StackLayout.javajet
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ templates/layout/StackLayout.javajet	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,4 @@
+<%@ jet package="org.eclipse.gmf.graphdef.codegen.templates" class="InitStackLayoutGenerator"%>
+<%
+// nothing to do
+%>
#P org.eclipse.gmf.tests
Index: src/org/eclipse/gmf/tests/gen/FigureLayoutTest.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gen/FigureLayoutTest.java,v
retrieving revision 1.1
diff -u -r1.1 FigureLayoutTest.java
--- src/org/eclipse/gmf/tests/gen/FigureLayoutTest.java	13 Feb 2006 17:36:07 -0000	1.1
+++ src/org/eclipse/gmf/tests/gen/FigureLayoutTest.java	15 Feb 2006 13:41:11 -0000
@@ -13,11 +13,15 @@
 import org.eclipse.gmf.gmfgraph.Figure;
 import org.eclipse.gmf.gmfgraph.FigureMarker;
 import org.eclipse.gmf.gmfgraph.FigureRef;
+import org.eclipse.gmf.gmfgraph.FlowLayout;
 import org.eclipse.gmf.gmfgraph.GMFGraphFactory;
 import org.eclipse.gmf.gmfgraph.GridLayout;
 import org.eclipse.gmf.gmfgraph.GridLayoutData;
 import org.eclipse.gmf.gmfgraph.LayoutData;
+import org.eclipse.gmf.gmfgraph.RGBColor;
 import org.eclipse.gmf.gmfgraph.Rectangle;
+import org.eclipse.gmf.gmfgraph.StackLayout;
+import org.eclipse.gmf.gmfgraph.XYLayoutData;
 
 public class FigureLayoutTest extends FigureCodegenTestBase {
 	public FigureLayoutTest(String name){
@@ -223,6 +227,90 @@
 		performTests(parent);
 	}
 	
+	public void testStackLayout(){
+		Figure group = createRGBGroup("Stack");
+		group.setLayout(GMFGraphFactory.eINSTANCE.createStackLayout());
+		performTests(group);
+	}
+	
+	public void testFlowLayout(){
+		Figure group = createRGBGroup("Flow");
+		FlowLayout flowLayout = GMFGraphFactory.eINSTANCE.createFlowLayout();
+		flowLayout.setVertical(false);
+		flowLayout.setForceSingleLine(false);
+		flowLayout.setMinorAlignment(Alignment.END_LITERAL);
+		flowLayout.setMajorAlignment(Alignment.FILL_LITERAL); // wrong one
+		flowLayout.setMinorSpacing(23);
+		flowLayout.setMinorSpacing(32);
+		group.setLayout(flowLayout);
+		performTests(group);
+	}
+
+	public void testToolbarLayoutUnusedAndIncorrectValues(){
+		Figure group = createRGBGroup("ToolbarBadConfig");
+		FlowLayout flowLayout = GMFGraphFactory.eINSTANCE.createFlowLayout();
+		flowLayout.setForceSingleLine(true);
+		flowLayout.setMinorSpacing(23456);
+		flowLayout.setMajorAlignment(Alignment.FILL_LITERAL);
+		group.setLayout(flowLayout);
+		performTests(group);
+	}
+
+	public void testToolbarLayout(){
+		Figure group = createRGBGroup("Toolbar");
+		FlowLayout flowLayout = GMFGraphFactory.eINSTANCE.createFlowLayout();
+		flowLayout.setForceSingleLine(true);
+		flowLayout.setMajorSpacing(11);
+		flowLayout.setMinorAlignment(Alignment.END_LITERAL); 
+		group.setLayout(flowLayout);
+		performTests(group);
+	}
+	
+	public void testXYLayout(){
+		Figure group = createRGBGroup("XY");
+		group.setLayout(GMFGraphFactory.eINSTANCE.createXYLayout());
+		
+		Figure left = (Figure) group.getChildren().get(0);
+		XYLayoutData leftDataCorrect =  GMFGraphFactory.eINSTANCE.createXYLayoutData();
+		leftDataCorrect.setTopLeft(GMFGraphFactory.eINSTANCE.createPoint());
+		leftDataCorrect.getTopLeft().setX(12);
+		leftDataCorrect.getTopLeft().setX(13);
+		leftDataCorrect.setSize(GMFGraphFactory.eINSTANCE.createDimension());
+		leftDataCorrect.getSize().setDx(20);
+		leftDataCorrect.getSize().setDy(30);
+		leftDataCorrect.setOwner(left);
+		
+		Figure right = (Figure) group.getChildren().get(1);
+		XYLayoutData rightDataIncomplete =  GMFGraphFactory.eINSTANCE.createXYLayoutData();
+		rightDataIncomplete.setSize(GMFGraphFactory.eINSTANCE.createDimension());
+		rightDataIncomplete.getSize().setDx(30);
+		rightDataIncomplete.getSize().setDy(20);
+		right.setLayoutData(rightDataIncomplete);
+		
+		performTests(group);
+		performTests(right);
+		performTests(left);
+	}
+
+	private Figure createRGBGroup(String rootName){
+		Figure parent = GMFGraphFactory.eINSTANCE.createRectangle();
+		setColor(parent, 0, 0, 255);
+		parent.setName(rootName);
+		
+		Figure greenEllipse = GMFGraphFactory.eINSTANCE.createEllipse();
+		greenEllipse.setName("GreenEllipse");
+		setColor(greenEllipse, 0, 255, 0);
+		
+		Figure redRRectangle = GMFGraphFactory.eINSTANCE.createRoundedRectangle();
+		redRRectangle.setName("RedRoundedRectangle");
+		setColor(redRRectangle, 255, 0, 0);
+		
+		parent.getChildren().add(greenEllipse);
+		parent.getChildren().add(redRRectangle);
+		
+		return parent;
+	}
+	
 	private Figure addPairOfChildRectnaglesAndReturnLeft(Figure parent){
 		GridLayout parentLayout = createGridLayoutAllProperties();
 		parentLayout.setNumColumns(2);
@@ -286,5 +374,13 @@
 		result.setVertical(isVertical);
 		return result;
 	}
+	
+	private void setColor(Figure figure, int red, int green, int blue){
+		RGBColor color = GMFGraphFactory.eINSTANCE.createRGBColor();
+		color.setRed(red);
+		color.setGreen(green);
+		color.setBlue(blue);
+		figure.setForegroundColor(color);
+	}
 
 }