+
@@ -97,7 +97,6 @@
containment="true"/>
@@ -300,4 +299,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: models/gmfgraph.genmodel
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef/models/gmfgraph.genmodel,v
retrieving revision 1.5
diff -u -r1.5 gmfgraph.genmodel
--- models/gmfgraph.genmodel 4 Feb 2006 23:36:21 -0000 1.5
+++ models/gmfgraph.genmodel 9 Feb 2006 18:41:43 -0000
@@ -50,6 +50,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: src/org/eclipse/gmf/gmfgraph/Alignment.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/Alignment.java
diff -N src/org/eclipse/gmf/gmfgraph/Alignment.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/Alignment.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,205 @@
+/**
+ *
+ *
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.AbstractEnumerator;
+
+/**
+ *
+ * A representation of the literals of the enumeration 'Alignment BEGINNING
+ * If the meaning of 'BEGINNING
+ *
+ * @see #BEGINNING_LITERAL
+ * @model
+ * @generated
+ * @ordered
+ */
+ public static final int BEGINNING = 0;
+
+ /**
+ * The 'CENTER
+ * If the meaning of 'CENTER
+ *
+ * @see #CENTER_LITERAL
+ * @model
+ * @generated
+ * @ordered
+ */
+ public static final int CENTER = 1;
+
+ /**
+ * The 'END
+ * If the meaning of 'END
+ *
+ * @see #END_LITERAL
+ * @model
+ * @generated
+ * @ordered
+ */
+ public static final int END = 2;
+
+ /**
+ * The 'FILL
+ * If the meaning of 'FILL
+ *
+ * @see #FILL_LITERAL
+ * @model
+ * @generated
+ * @ordered
+ */
+ public static final int FILL = 3;
+
+ /**
+ * The 'BEGINNING CENTER END FILL Alignment Alignment Alignment Alignment Alignment
+ *
+ *
+ * $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.Alignment;
+import org.eclipse.gmf.gmfgraph.BorderLayoutData;
+import org.eclipse.gmf.gmfgraph.GMFGraphPackage;
+
+import org.eclipse.gmf.gmfgraph.Layoutable;
+
+/**
+ *
+ * An implementation of the model object 'Border Layout Data
+ * The following features are implemented:
+ *
+ * {@link org.eclipse.gmf.gmfgraph.impl.BorderLayoutDataImpl#getQualifiedClassName Qualified Class Name }
+ * {@link org.eclipse.gmf.gmfgraph.impl.BorderLayoutDataImpl#getBundleName Bundle Name }
+ * {@link org.eclipse.gmf.gmfgraph.impl.BorderLayoutDataImpl#getOwner Owner }
+ * {@link org.eclipse.gmf.gmfgraph.impl.BorderLayoutDataImpl#getAlignment Alignment }
+ * {@link org.eclipse.gmf.gmfgraph.impl.BorderLayoutDataImpl#isVertical Vertical }
+ *
+ *
+ *
+ * @generated
+ */
+public class BorderLayoutDataImpl extends EObjectImpl implements BorderLayoutData {
+ /**
+ * The default value of the '{@link #getQualifiedClassName() Qualified Class Name }' attribute.
+ *
+ *
+ * @see #getQualifiedClassName()
+ * @generated
+ * @ordered
+ */
+ protected static final String QUALIFIED_CLASS_NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getQualifiedClassName() Qualified Class Name }' attribute.
+ *
+ *
+ * @see #getQualifiedClassName()
+ * @generated
+ * @ordered
+ */
+ protected String qualifiedClassName = QUALIFIED_CLASS_NAME_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getBundleName() Bundle Name }' attribute.
+ *
+ *
+ * @see #getBundleName()
+ * @generated
+ * @ordered
+ */
+ protected static final String BUNDLE_NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getBundleName() Bundle Name }' attribute.
+ *
+ *
+ * @see #getBundleName()
+ * @generated
+ * @ordered
+ */
+ protected String bundleName = BUNDLE_NAME_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getAlignment() Alignment }' attribute.
+ *
+ *
+ * @see #getAlignment()
+ * @generated
+ * @ordered
+ */
+ protected static final Alignment ALIGNMENT_EDEFAULT = Alignment.CENTER_LITERAL;
+
+ /**
+ * The cached value of the '{@link #getAlignment() Alignment }' attribute.
+ *
+ *
+ * @see #getAlignment()
+ * @generated
+ * @ordered
+ */
+ protected Alignment alignment = ALIGNMENT_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #isVertical() Vertical }' attribute.
+ *
+ *
+ * @see #isVertical()
+ * @generated
+ * @ordered
+ */
+ protected static final boolean VERTICAL_EDEFAULT = false;
+
+ /**
+ * The cached value of the '{@link #isVertical() Vertical }' attribute.
+ *
+ *
+ * @see #isVertical()
+ * @generated
+ * @ordered
+ */
+ protected boolean vertical = VERTICAL_EDEFAULT;
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected BorderLayoutDataImpl() {
+ super();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected EClass eStaticClass() {
+ return GMFGraphPackage.eINSTANCE.getBorderLayoutData();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String getQualifiedClassNameGen() {
+ return qualifiedClassName;
+ }
+
+ /**
+ * @generated NOT
+ */
+ public String getQualifiedClassName() {
+ return "java.lang.Object";
+ }
+
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setQualifiedClassNameGen(String newQualifiedClassName) {
+ String oldQualifiedClassName = qualifiedClassName;
+ qualifiedClassName = newQualifiedClassName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.BORDER_LAYOUT_DATA__QUALIFIED_CLASS_NAME, oldQualifiedClassName, qualifiedClassName));
+ }
+
+ /**
+ * @generated NOT
+ */
+ public void setQualifiedClassName(String newQualifiedClassName) {
+ //throw new UnsupportedOperationException("You can not change predefined name of implementation class");
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String getBundleName() {
+ return bundleName;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setBundleName(String newBundleName) {
+ String oldBundleName = bundleName;
+ bundleName = newBundleName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.BORDER_LAYOUT_DATA__BUNDLE_NAME, oldBundleName, bundleName));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Layoutable getOwner() {
+ if (eContainerFeatureID != GMFGraphPackage.BORDER_LAYOUT_DATA__OWNER) return null;
+ return (Layoutable)eContainer();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setOwner(Layoutable newOwner) {
+ if (newOwner != eInternalContainer() || (eContainerFeatureID != GMFGraphPackage.BORDER_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__DATA, Layoutable.class, msgs);
+ msgs = eBasicSetContainer((InternalEObject)newOwner, GMFGraphPackage.BORDER_LAYOUT_DATA__OWNER, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.BORDER_LAYOUT_DATA__OWNER, newOwner, newOwner));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Alignment getAlignment() {
+ return alignment;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setAlignment(Alignment newAlignment) {
+ Alignment oldAlignment = alignment;
+ alignment = newAlignment == null ? ALIGNMENT_EDEFAULT : newAlignment;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.BORDER_LAYOUT_DATA__ALIGNMENT, oldAlignment, alignment));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public boolean isVertical() {
+ return vertical;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setVertical(boolean newVertical) {
+ boolean oldVertical = vertical;
+ vertical = newVertical;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.BORDER_LAYOUT_DATA__VERTICAL, oldVertical, vertical));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case GMFGraphPackage.BORDER_LAYOUT_DATA__OWNER:
+ if (eInternalContainer() != null)
+ msgs = eBasicRemoveFromContainer(msgs);
+ return eBasicSetContainer(otherEnd, GMFGraphPackage.BORDER_LAYOUT_DATA__OWNER, msgs);
+ }
+ return super.eInverseAdd(otherEnd, featureID, msgs);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case GMFGraphPackage.BORDER_LAYOUT_DATA__OWNER:
+ return eBasicSetContainer(null, GMFGraphPackage.BORDER_LAYOUT_DATA__OWNER, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+ switch (eContainerFeatureID) {
+ case GMFGraphPackage.BORDER_LAYOUT_DATA__OWNER:
+ return eInternalContainer().eInverseRemove(this, GMFGraphPackage.LAYOUTABLE__DATA, Layoutable.class, msgs);
+ }
+ return super.eBasicRemoveFromContainerFeature(msgs);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case GMFGraphPackage.BORDER_LAYOUT_DATA__QUALIFIED_CLASS_NAME:
+ return getQualifiedClassName();
+ case GMFGraphPackage.BORDER_LAYOUT_DATA__BUNDLE_NAME:
+ return getBundleName();
+ case GMFGraphPackage.BORDER_LAYOUT_DATA__OWNER:
+ return getOwner();
+ case GMFGraphPackage.BORDER_LAYOUT_DATA__ALIGNMENT:
+ return getAlignment();
+ case GMFGraphPackage.BORDER_LAYOUT_DATA__VERTICAL:
+ return isVertical() ? Boolean.TRUE : Boolean.FALSE;
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case GMFGraphPackage.BORDER_LAYOUT_DATA__QUALIFIED_CLASS_NAME:
+ setQualifiedClassName((String)newValue);
+ return;
+ case GMFGraphPackage.BORDER_LAYOUT_DATA__BUNDLE_NAME:
+ setBundleName((String)newValue);
+ return;
+ case GMFGraphPackage.BORDER_LAYOUT_DATA__OWNER:
+ setOwner((Layoutable)newValue);
+ return;
+ case GMFGraphPackage.BORDER_LAYOUT_DATA__ALIGNMENT:
+ setAlignment((Alignment)newValue);
+ return;
+ case GMFGraphPackage.BORDER_LAYOUT_DATA__VERTICAL:
+ setVertical(((Boolean)newValue).booleanValue());
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case GMFGraphPackage.BORDER_LAYOUT_DATA__QUALIFIED_CLASS_NAME:
+ setQualifiedClassName(QUALIFIED_CLASS_NAME_EDEFAULT);
+ return;
+ case GMFGraphPackage.BORDER_LAYOUT_DATA__BUNDLE_NAME:
+ setBundleName(BUNDLE_NAME_EDEFAULT);
+ return;
+ case GMFGraphPackage.BORDER_LAYOUT_DATA__OWNER:
+ setOwner((Layoutable)null);
+ return;
+ case GMFGraphPackage.BORDER_LAYOUT_DATA__ALIGNMENT:
+ setAlignment(ALIGNMENT_EDEFAULT);
+ return;
+ case GMFGraphPackage.BORDER_LAYOUT_DATA__VERTICAL:
+ setVertical(VERTICAL_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case GMFGraphPackage.BORDER_LAYOUT_DATA__QUALIFIED_CLASS_NAME:
+ return QUALIFIED_CLASS_NAME_EDEFAULT == null ? qualifiedClassName != null : !QUALIFIED_CLASS_NAME_EDEFAULT.equals(qualifiedClassName);
+ case GMFGraphPackage.BORDER_LAYOUT_DATA__BUNDLE_NAME:
+ return BUNDLE_NAME_EDEFAULT == null ? bundleName != null : !BUNDLE_NAME_EDEFAULT.equals(bundleName);
+ case GMFGraphPackage.BORDER_LAYOUT_DATA__OWNER:
+ return getOwner() != null;
+ case GMFGraphPackage.BORDER_LAYOUT_DATA__ALIGNMENT:
+ return alignment != ALIGNMENT_EDEFAULT;
+ case GMFGraphPackage.BORDER_LAYOUT_DATA__VERTICAL:
+ return vertical != VERTICAL_EDEFAULT;
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (qualifiedClassName: ");
+ result.append(qualifiedClassName);
+ result.append(", bundleName: ");
+ result.append(bundleName);
+ result.append(", alignment: ");
+ result.append(alignment);
+ result.append(", vertical: ");
+ result.append(vertical);
+ result.append(')');
+ return result.toString();
+ }
+
+} //BorderLayoutDataImpl
Index: src/org/eclipse/gmf/gmfgraph/impl/LayoutDataImpl.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/impl/LayoutDataImpl.java
diff -N src/org/eclipse/gmf/gmfgraph/impl/LayoutDataImpl.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/impl/LayoutDataImpl.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,305 @@
+/**
+ *
+ *
+ *
+ * $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.Alignment;
+import org.eclipse.gmf.gmfgraph.Dimension;
+import org.eclipse.gmf.gmfgraph.GMFGraphPackage;
+import org.eclipse.gmf.gmfgraph.LayoutData;
+import org.eclipse.gmf.gmfgraph.Layoutable;
+
+/**
+ *
+ * An implementation of the model object 'Layout Data
+ * The following features are implemented:
+ *
+ * {@link org.eclipse.gmf.gmfgraph.impl.LayoutDataImpl#getQualifiedClassName Qualified Class Name }
+ * {@link org.eclipse.gmf.gmfgraph.impl.LayoutDataImpl#getBundleName Bundle Name }
+ * {@link org.eclipse.gmf.gmfgraph.impl.LayoutDataImpl#getOwner Owner }
+ *
+ *
+ *
+ * @generated
+ */
+public class LayoutDataImpl extends EObjectImpl implements LayoutData {
+ /**
+ * The default value of the '{@link #getQualifiedClassName() Qualified Class Name }' attribute.
+ *
+ *
+ * @see #getQualifiedClassName()
+ * @generated
+ * @ordered
+ */
+ protected static final String QUALIFIED_CLASS_NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getQualifiedClassName() Qualified Class Name }' attribute.
+ *
+ *
+ * @see #getQualifiedClassName()
+ * @generated
+ * @ordered
+ */
+ protected String qualifiedClassName = QUALIFIED_CLASS_NAME_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getBundleName() Bundle Name }' attribute.
+ *
+ *
+ * @see #getBundleName()
+ * @generated
+ * @ordered
+ */
+ protected static final String BUNDLE_NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getBundleName() Bundle Name }' attribute.
+ *
+ *
+ * @see #getBundleName()
+ * @generated
+ * @ordered
+ */
+ protected String bundleName = BUNDLE_NAME_EDEFAULT;
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected LayoutDataImpl() {
+ super();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected EClass eStaticClass() {
+ return GMFGraphPackage.eINSTANCE.getLayoutData();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String getQualifiedClassName() {
+ return qualifiedClassName;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setQualifiedClassName(String newQualifiedClassName) {
+ String oldQualifiedClassName = qualifiedClassName;
+ qualifiedClassName = newQualifiedClassName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.LAYOUT_DATA__QUALIFIED_CLASS_NAME, oldQualifiedClassName, qualifiedClassName));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String getBundleName() {
+ return bundleName;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setBundleName(String newBundleName) {
+ String oldBundleName = bundleName;
+ bundleName = newBundleName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.LAYOUT_DATA__BUNDLE_NAME, oldBundleName, bundleName));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Layoutable getOwner() {
+ if (eContainerFeatureID != GMFGraphPackage.LAYOUT_DATA__OWNER) return null;
+ return (Layoutable)eContainer();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setOwner(Layoutable newOwner) {
+ if (newOwner != eInternalContainer() || (eContainerFeatureID != GMFGraphPackage.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__DATA, Layoutable.class, msgs);
+ msgs = eBasicSetContainer((InternalEObject)newOwner, GMFGraphPackage.LAYOUT_DATA__OWNER, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.LAYOUT_DATA__OWNER, newOwner, newOwner));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case GMFGraphPackage.LAYOUT_DATA__OWNER:
+ if (eInternalContainer() != null)
+ msgs = eBasicRemoveFromContainer(msgs);
+ return eBasicSetContainer(otherEnd, GMFGraphPackage.LAYOUT_DATA__OWNER, msgs);
+ }
+ return super.eInverseAdd(otherEnd, featureID, msgs);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case GMFGraphPackage.LAYOUT_DATA__OWNER:
+ return eBasicSetContainer(null, GMFGraphPackage.LAYOUT_DATA__OWNER, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+ switch (eContainerFeatureID) {
+ case GMFGraphPackage.LAYOUT_DATA__OWNER:
+ return eInternalContainer().eInverseRemove(this, GMFGraphPackage.LAYOUTABLE__DATA, Layoutable.class, msgs);
+ }
+ return super.eBasicRemoveFromContainerFeature(msgs);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case GMFGraphPackage.LAYOUT_DATA__QUALIFIED_CLASS_NAME:
+ return getQualifiedClassName();
+ case GMFGraphPackage.LAYOUT_DATA__BUNDLE_NAME:
+ return getBundleName();
+ case GMFGraphPackage.LAYOUT_DATA__OWNER:
+ return getOwner();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case GMFGraphPackage.LAYOUT_DATA__QUALIFIED_CLASS_NAME:
+ setQualifiedClassName((String)newValue);
+ return;
+ case GMFGraphPackage.LAYOUT_DATA__BUNDLE_NAME:
+ setBundleName((String)newValue);
+ return;
+ case GMFGraphPackage.LAYOUT_DATA__OWNER:
+ setOwner((Layoutable)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case GMFGraphPackage.LAYOUT_DATA__QUALIFIED_CLASS_NAME:
+ setQualifiedClassName(QUALIFIED_CLASS_NAME_EDEFAULT);
+ return;
+ case GMFGraphPackage.LAYOUT_DATA__BUNDLE_NAME:
+ setBundleName(BUNDLE_NAME_EDEFAULT);
+ return;
+ case GMFGraphPackage.LAYOUT_DATA__OWNER:
+ setOwner((Layoutable)null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case GMFGraphPackage.LAYOUT_DATA__QUALIFIED_CLASS_NAME:
+ return QUALIFIED_CLASS_NAME_EDEFAULT == null ? qualifiedClassName != null : !QUALIFIED_CLASS_NAME_EDEFAULT.equals(qualifiedClassName);
+ case GMFGraphPackage.LAYOUT_DATA__BUNDLE_NAME:
+ return BUNDLE_NAME_EDEFAULT == null ? bundleName != null : !BUNDLE_NAME_EDEFAULT.equals(bundleName);
+ case GMFGraphPackage.LAYOUT_DATA__OWNER:
+ return getOwner() != null;
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (qualifiedClassName: ");
+ result.append(qualifiedClassName);
+ result.append(", bundleName: ");
+ result.append(bundleName);
+ result.append(')');
+ return result.toString();
+ }
+
+} //LayoutDataImpl
Index: src/org/eclipse/gmf/gmfgraph/CustomAttribute.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/CustomAttribute.java
diff -N src/org/eclipse/gmf/gmfgraph/CustomAttribute.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/CustomAttribute.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,166 @@
+/**
+ *
+ *
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ *
+ * A representation of the model object 'Custom Attribute
+ * The following features are supported:
+ *
+ * {@link org.eclipse.gmf.gmfgraph.CustomAttribute#getName Name }
+ * {@link org.eclipse.gmf.gmfgraph.CustomAttribute#getType Type }
+ * {@link org.eclipse.gmf.gmfgraph.CustomAttribute#getValue Value }
+ * {@link org.eclipse.gmf.gmfgraph.CustomAttribute#isDirectAccess Direct Access }
+ * {@link org.eclipse.gmf.gmfgraph.CustomAttribute#isMultiStatementValue Multi Statement Value }
+ *
+ *
+ *
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getCustomAttribute()
+ * @model
+ * @generated
+ */
+public interface CustomAttribute extends EObject {
+ /**
+ * Returns the value of the 'Name
+ * If the meaning of the 'Name ' attribute isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Name ' attribute.
+ * @see #setName(String)
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getCustomAttribute_Name()
+ * @model required="true"
+ * @generated
+ */
+ String getName();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.CustomAttribute#getName Name }' attribute.
+ *
+ *
+ * @param value the new value of the 'Name ' attribute.
+ * @see #getName()
+ * @generated
+ */
+ void setName(String value);
+
+ /**
+ * Returns the value of the 'Type "Object".
+ *
+ *
+ * If the meaning of the 'Type ' attribute isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Type ' attribute.
+ * @see #setType(String)
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getCustomAttribute_Type()
+ * @model default="Object" required="true"
+ * @generated
+ */
+ String getType();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.CustomAttribute#getType Type }' attribute.
+ *
+ *
+ * @param value the new value of the 'Type ' attribute.
+ * @see #getType()
+ * @generated
+ */
+ void setType(String value);
+
+ /**
+ * Returns the value of the 'Value "null".
+ *
+ *
+ * If the meaning of the 'Value ' attribute isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Value ' attribute.
+ * @see #setValue(String)
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getCustomAttribute_Value()
+ * @model default="null" required="true"
+ * @generated
+ */
+ String getValue();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.CustomAttribute#getValue Value }' attribute.
+ *
+ *
+ * @param value the new value of the 'Value ' attribute.
+ * @see #getValue()
+ * @generated
+ */
+ void setValue(String value);
+
+ /**
+ * Returns the value of the 'Direct Access "false".
+ *
+ *
+ * If the meaning of the 'Direct Access ' attribute isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Direct Access ' attribute.
+ * @see #setDirectAccess(boolean)
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getCustomAttribute_DirectAccess()
+ * @model default="false" required="true"
+ * @generated
+ */
+ boolean isDirectAccess();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.CustomAttribute#isDirectAccess Direct Access }' attribute.
+ *
+ *
+ * @param value the new value of the 'Direct Access ' attribute.
+ * @see #isDirectAccess()
+ * @generated
+ */
+ void setDirectAccess(boolean value);
+
+ /**
+ * Returns the value of the 'Multi Statement Value "false".
+ *
+ *
+ * If the meaning of the 'Multi Statement Value ' attribute isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Multi Statement Value ' attribute.
+ * @see #setMultiStatementValue(boolean)
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getCustomAttribute_MultiStatementValue()
+ * @model default="false" required="true"
+ * @generated
+ */
+ boolean isMultiStatementValue();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.CustomAttribute#isMultiStatementValue Multi Statement Value }' attribute.
+ *
+ *
+ * @param value the new value of the 'Multi Statement Value ' attribute.
+ * @see #isMultiStatementValue()
+ * @generated
+ */
+ void setMultiStatementValue(boolean value);
+
+} // CustomAttribute
Index: src/org/eclipse/gmf/gmfgraph/Layoutable.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/Layoutable.java
diff -N src/org/eclipse/gmf/gmfgraph/Layoutable.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/Layoutable.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,83 @@
+/**
+ *
+ *
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ *
+ * A representation of the model object 'Layoutable
+ * The following features are supported:
+ *
+ * {@link org.eclipse.gmf.gmfgraph.Layoutable#getData Data }
+ * {@link org.eclipse.gmf.gmfgraph.Layoutable#getLayout Layout }
+ *
+ *
+ *
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getLayoutable()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+public interface Layoutable extends EObject {
+ /**
+ * Returns the value of the 'Data Owner }'.
+ *
+ *
+ * If the meaning of the 'Data ' containment reference isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Data ' containment reference.
+ * @see #setData(LayoutData)
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getLayoutable_Data()
+ * @see org.eclipse.gmf.gmfgraph.LayoutData#getOwner
+ * @model opposite="owner" containment="true"
+ * @generated
+ */
+ LayoutData getData();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.Layoutable#getData Data }' containment reference.
+ *
+ *
+ * @param value the new value of the 'Data ' containment reference.
+ * @see #getData()
+ * @generated
+ */
+ void setData(LayoutData value);
+
+ /**
+ * Returns the value of the 'Layout
+ * If the meaning of the 'Layout ' containment reference isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Layout ' containment reference.
+ * @see #setLayout(Layout)
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getLayoutable_Layout()
+ * @model containment="true"
+ * @generated
+ */
+ Layout getLayout();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.Layoutable#getLayout Layout }' containment reference.
+ *
+ *
+ * @param value the new value of the 'Layout ' containment reference.
+ * @see #getLayout()
+ * @generated
+ */
+ void setLayout(Layout value);
+
+} // Layoutable
Index: src/org/eclipse/gmf/gmfgraph/GridLayout.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/GridLayout.java
diff -N src/org/eclipse/gmf/gmfgraph/GridLayout.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/GridLayout.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,136 @@
+/**
+ *
+ *
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph;
+
+
+/**
+ *
+ * A representation of the model object 'Grid Layout
+ * The following features are supported:
+ *
+ * {@link org.eclipse.gmf.gmfgraph.GridLayout#getNumColumns Num Columns }
+ * {@link org.eclipse.gmf.gmfgraph.GridLayout#isEqualWidth Equal Width }
+ * {@link org.eclipse.gmf.gmfgraph.GridLayout#getMargins Margins }
+ * {@link org.eclipse.gmf.gmfgraph.GridLayout#getSpacing Spacing }
+ *
+ *
+ *
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getGridLayout()
+ * @model
+ * @generated
+ */
+public interface GridLayout extends Layout {
+ /**
+ * Returns the value of the 'Num Columns "1".
+ *
+ *
+ * If the meaning of the 'Num Columns ' attribute isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Num Columns ' attribute.
+ * @see #setNumColumns(int)
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getGridLayout_NumColumns()
+ * @model default="1" required="true"
+ * @generated
+ */
+ int getNumColumns();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.GridLayout#getNumColumns Num Columns }' attribute.
+ *
+ *
+ * @param value the new value of the 'Num Columns ' attribute.
+ * @see #getNumColumns()
+ * @generated
+ */
+ void setNumColumns(int value);
+
+ /**
+ * Returns the value of the 'Equal Width "true".
+ *
+ *
+ * If the meaning of the 'Equal Width ' attribute isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Equal Width ' attribute.
+ * @see #setEqualWidth(boolean)
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getGridLayout_EqualWidth()
+ * @model default="true" required="true"
+ * @generated
+ */
+ boolean isEqualWidth();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.GridLayout#isEqualWidth Equal Width }' attribute.
+ *
+ *
+ * @param value the new value of the 'Equal Width ' attribute.
+ * @see #isEqualWidth()
+ * @generated
+ */
+ void setEqualWidth(boolean value);
+
+ /**
+ * Returns the value of the 'Margins
+ * If the meaning of the 'Margins ' containment reference isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Margins ' containment reference.
+ * @see #setMargins(Dimension)
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getGridLayout_Margins()
+ * @model containment="true"
+ * @generated
+ */
+ Dimension getMargins();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.GridLayout#getMargins Margins }' containment reference.
+ *
+ *
+ * @param value the new value of the 'Margins ' containment reference.
+ * @see #getMargins()
+ * @generated
+ */
+ void setMargins(Dimension value);
+
+ /**
+ * Returns the value of the 'Spacing
+ * If the meaning of the 'Spacing ' containment reference isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Spacing ' containment reference.
+ * @see #setSpacing(Dimension)
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getGridLayout_Spacing()
+ * @model containment="true"
+ * @generated
+ */
+ Dimension getSpacing();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.GridLayout#getSpacing Spacing }' containment reference.
+ *
+ *
+ * @param value the new value of the 'Spacing ' containment reference.
+ * @see #getSpacing()
+ * @generated
+ */
+ void setSpacing(Dimension value);
+
+} // GridLayout
Index: src/org/eclipse/gmf/gmfgraph/BorderLayout.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/BorderLayout.java
diff -N src/org/eclipse/gmf/gmfgraph/BorderLayout.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/BorderLayout.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,53 @@
+/**
+ *
+ *
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph;
+
+
+/**
+ *
+ * A representation of the model object 'Border Layout
+ * The following features are supported:
+ *
+ * {@link org.eclipse.gmf.gmfgraph.BorderLayout#getSpacing Spacing }
+ *
+ *
+ *
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getBorderLayout()
+ * @model
+ * @generated
+ */
+public interface BorderLayout extends Layout {
+ /**
+ * Returns the value of the 'Spacing
+ * If the meaning of the 'Spacing ' containment reference isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Spacing ' containment reference.
+ * @see #setSpacing(Dimension)
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getBorderLayout_Spacing()
+ * @model containment="true"
+ * @generated
+ */
+ Dimension getSpacing();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.BorderLayout#getSpacing Spacing }' containment reference.
+ *
+ *
+ * @param value the new value of the 'Spacing ' containment reference.
+ * @see #getSpacing()
+ * @generated
+ */
+ void setSpacing(Dimension value);
+
+} // BorderLayout
Index: src/org/eclipse/gmf/gmfgraph/ImplementationAware.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/ImplementationAware.java
diff -N src/org/eclipse/gmf/gmfgraph/ImplementationAware.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/ImplementationAware.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,30 @@
+/**
+ *
+ *
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ *
+ * A representation of the model object 'Implementation Aware
+ *
+ *
+ * $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.gmf.gmfgraph.BorderLayout;
+import org.eclipse.gmf.gmfgraph.Dimension;
+import org.eclipse.gmf.gmfgraph.GMFGraphPackage;
+
+/**
+ *
+ * An implementation of the model object 'Border Layout
+ * The following features are implemented:
+ *
+ * {@link org.eclipse.gmf.gmfgraph.impl.BorderLayoutImpl#getQualifiedClassName Qualified Class Name }
+ * {@link org.eclipse.gmf.gmfgraph.impl.BorderLayoutImpl#getBundleName Bundle Name }
+ * {@link org.eclipse.gmf.gmfgraph.impl.BorderLayoutImpl#getSpacing Spacing }
+ *
+ *
+ *
+ * @generated
+ */
+public class BorderLayoutImpl extends EObjectImpl implements BorderLayout {
+ /**
+ * The default value of the '{@link #getQualifiedClassName() Qualified Class Name }' attribute.
+ *
+ *
+ * @see #getQualifiedClassName()
+ * @generated
+ * @ordered
+ */
+ protected static final String QUALIFIED_CLASS_NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getQualifiedClassName() Qualified Class Name }' attribute.
+ *
+ *
+ * @see #getQualifiedClassName()
+ * @generated
+ * @ordered
+ */
+ protected String qualifiedClassName = QUALIFIED_CLASS_NAME_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getBundleName() Bundle Name }' attribute.
+ *
+ *
+ * @see #getBundleName()
+ * @generated
+ * @ordered
+ */
+ protected static final String BUNDLE_NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getBundleName() Bundle Name }' attribute.
+ *
+ *
+ * @see #getBundleName()
+ * @generated
+ * @ordered
+ */
+ protected String bundleName = BUNDLE_NAME_EDEFAULT;
+
+ /**
+ * The cached value of the '{@link #getSpacing() Spacing }' containment reference.
+ *
+ *
+ * @see #getSpacing()
+ * @generated
+ * @ordered
+ */
+ protected Dimension spacing = null;
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected BorderLayoutImpl() {
+ super();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected EClass eStaticClass() {
+ return GMFGraphPackage.eINSTANCE.getBorderLayout();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String getQualifiedClassNameGen() {
+ return qualifiedClassName;
+ }
+
+ /**
+ * @generated NOT
+ */
+ public String getQualifiedClassName() {
+ return "org.eclipse.draw2d.BorderLayout";
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setQualifiedClassNameGen(String newQualifiedClassName) {
+ String oldQualifiedClassName = qualifiedClassName;
+ qualifiedClassName = newQualifiedClassName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.BORDER_LAYOUT__QUALIFIED_CLASS_NAME, oldQualifiedClassName, qualifiedClassName));
+ }
+
+ /**
+ * @generated NOT
+ */
+ public void setQualifiedClassName(String newQualifiedClassName) {
+ //throw new UnsupportedOperationException("You can not change predefined name of implementation class");
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String getBundleName() {
+ return bundleName;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setBundleName(String newBundleName) {
+ String oldBundleName = bundleName;
+ bundleName = newBundleName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.BORDER_LAYOUT__BUNDLE_NAME, oldBundleName, bundleName));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Dimension getSpacing() {
+ return spacing;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public NotificationChain basicSetSpacing(Dimension newSpacing, NotificationChain msgs) {
+ Dimension oldSpacing = spacing;
+ spacing = newSpacing;
+ if (eNotificationRequired()) {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.BORDER_LAYOUT__SPACING, oldSpacing, newSpacing);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setSpacing(Dimension newSpacing) {
+ if (newSpacing != spacing) {
+ NotificationChain msgs = null;
+ if (spacing != null)
+ msgs = ((InternalEObject)spacing).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.BORDER_LAYOUT__SPACING, null, msgs);
+ if (newSpacing != null)
+ msgs = ((InternalEObject)newSpacing).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.BORDER_LAYOUT__SPACING, null, msgs);
+ msgs = basicSetSpacing(newSpacing, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.BORDER_LAYOUT__SPACING, newSpacing, newSpacing));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case GMFGraphPackage.BORDER_LAYOUT__SPACING:
+ return basicSetSpacing(null, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case GMFGraphPackage.BORDER_LAYOUT__QUALIFIED_CLASS_NAME:
+ return getQualifiedClassName();
+ case GMFGraphPackage.BORDER_LAYOUT__BUNDLE_NAME:
+ return getBundleName();
+ case GMFGraphPackage.BORDER_LAYOUT__SPACING:
+ return getSpacing();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case GMFGraphPackage.BORDER_LAYOUT__QUALIFIED_CLASS_NAME:
+ setQualifiedClassName((String)newValue);
+ return;
+ case GMFGraphPackage.BORDER_LAYOUT__BUNDLE_NAME:
+ setBundleName((String)newValue);
+ return;
+ case GMFGraphPackage.BORDER_LAYOUT__SPACING:
+ setSpacing((Dimension)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case GMFGraphPackage.BORDER_LAYOUT__QUALIFIED_CLASS_NAME:
+ setQualifiedClassName(QUALIFIED_CLASS_NAME_EDEFAULT);
+ return;
+ case GMFGraphPackage.BORDER_LAYOUT__BUNDLE_NAME:
+ setBundleName(BUNDLE_NAME_EDEFAULT);
+ return;
+ case GMFGraphPackage.BORDER_LAYOUT__SPACING:
+ setSpacing((Dimension)null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case GMFGraphPackage.BORDER_LAYOUT__QUALIFIED_CLASS_NAME:
+ return QUALIFIED_CLASS_NAME_EDEFAULT == null ? qualifiedClassName != null : !QUALIFIED_CLASS_NAME_EDEFAULT.equals(qualifiedClassName);
+ case GMFGraphPackage.BORDER_LAYOUT__BUNDLE_NAME:
+ return BUNDLE_NAME_EDEFAULT == null ? bundleName != null : !BUNDLE_NAME_EDEFAULT.equals(bundleName);
+ case GMFGraphPackage.BORDER_LAYOUT__SPACING:
+ return spacing != null;
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (qualifiedClassName: ");
+ result.append(qualifiedClassName);
+ result.append(", bundleName: ");
+ result.append(bundleName);
+ result.append(')');
+ return result.toString();
+ }
+
+} //BorderLayoutImpl
Index: src/org/eclipse/gmf/gmfgraph/impl/CustomConfigurableClassImpl.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/impl/CustomConfigurableClassImpl.java
diff -N src/org/eclipse/gmf/gmfgraph/impl/CustomConfigurableClassImpl.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/impl/CustomConfigurableClassImpl.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,272 @@
+/**
+ *
+ *
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+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.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.gmf.gmfgraph.CustomAttribute;
+import org.eclipse.gmf.gmfgraph.CustomConfigurableClass;
+import org.eclipse.gmf.gmfgraph.GMFGraphPackage;
+
+/**
+ *
+ * An implementation of the model object 'Custom Configurable Class
+ * The following features are implemented:
+ *
+ * {@link org.eclipse.gmf.gmfgraph.impl.CustomConfigurableClassImpl#getQualifiedClassName Qualified Class Name }
+ * {@link org.eclipse.gmf.gmfgraph.impl.CustomConfigurableClassImpl#getBundleName Bundle Name }
+ * {@link org.eclipse.gmf.gmfgraph.impl.CustomConfigurableClassImpl#getAttributes Attributes }
+ *
+ *
+ *
+ * @generated
+ */
+public class CustomConfigurableClassImpl extends EObjectImpl implements CustomConfigurableClass {
+ /**
+ * The default value of the '{@link #getQualifiedClassName() Qualified Class Name }' attribute.
+ *
+ *
+ * @see #getQualifiedClassName()
+ * @generated
+ * @ordered
+ */
+ protected static final String QUALIFIED_CLASS_NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getQualifiedClassName() Qualified Class Name }' attribute.
+ *
+ *
+ * @see #getQualifiedClassName()
+ * @generated
+ * @ordered
+ */
+ protected String qualifiedClassName = QUALIFIED_CLASS_NAME_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getBundleName() Bundle Name }' attribute.
+ *
+ *
+ * @see #getBundleName()
+ * @generated
+ * @ordered
+ */
+ protected static final String BUNDLE_NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getBundleName() Bundle Name }' attribute.
+ *
+ *
+ * @see #getBundleName()
+ * @generated
+ * @ordered
+ */
+ protected String bundleName = BUNDLE_NAME_EDEFAULT;
+
+ /**
+ * The cached value of the '{@link #getAttributes() Attributes }' containment reference list.
+ *
+ *
+ * @see #getAttributes()
+ * @generated
+ * @ordered
+ */
+ protected EList attributes = null;
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected CustomConfigurableClassImpl() {
+ super();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected EClass eStaticClass() {
+ return GMFGraphPackage.eINSTANCE.getCustomConfigurableClass();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String getQualifiedClassName() {
+ return qualifiedClassName;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setQualifiedClassName(String newQualifiedClassName) {
+ String oldQualifiedClassName = qualifiedClassName;
+ qualifiedClassName = newQualifiedClassName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CUSTOM_CONFIGURABLE_CLASS__QUALIFIED_CLASS_NAME, oldQualifiedClassName, qualifiedClassName));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String getBundleName() {
+ return bundleName;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setBundleName(String newBundleName) {
+ String oldBundleName = bundleName;
+ bundleName = newBundleName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CUSTOM_CONFIGURABLE_CLASS__BUNDLE_NAME, oldBundleName, bundleName));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public EList getAttributes() {
+ if (attributes == null) {
+ attributes = new EObjectContainmentEList(CustomAttribute.class, this, GMFGraphPackage.CUSTOM_CONFIGURABLE_CLASS__ATTRIBUTES);
+ }
+ return attributes;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case GMFGraphPackage.CUSTOM_CONFIGURABLE_CLASS__ATTRIBUTES:
+ return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case GMFGraphPackage.CUSTOM_CONFIGURABLE_CLASS__QUALIFIED_CLASS_NAME:
+ return getQualifiedClassName();
+ case GMFGraphPackage.CUSTOM_CONFIGURABLE_CLASS__BUNDLE_NAME:
+ return getBundleName();
+ case GMFGraphPackage.CUSTOM_CONFIGURABLE_CLASS__ATTRIBUTES:
+ return getAttributes();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case GMFGraphPackage.CUSTOM_CONFIGURABLE_CLASS__QUALIFIED_CLASS_NAME:
+ setQualifiedClassName((String)newValue);
+ return;
+ case GMFGraphPackage.CUSTOM_CONFIGURABLE_CLASS__BUNDLE_NAME:
+ setBundleName((String)newValue);
+ return;
+ case GMFGraphPackage.CUSTOM_CONFIGURABLE_CLASS__ATTRIBUTES:
+ getAttributes().clear();
+ getAttributes().addAll((Collection)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case GMFGraphPackage.CUSTOM_CONFIGURABLE_CLASS__QUALIFIED_CLASS_NAME:
+ setQualifiedClassName(QUALIFIED_CLASS_NAME_EDEFAULT);
+ return;
+ case GMFGraphPackage.CUSTOM_CONFIGURABLE_CLASS__BUNDLE_NAME:
+ setBundleName(BUNDLE_NAME_EDEFAULT);
+ return;
+ case GMFGraphPackage.CUSTOM_CONFIGURABLE_CLASS__ATTRIBUTES:
+ getAttributes().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case GMFGraphPackage.CUSTOM_CONFIGURABLE_CLASS__QUALIFIED_CLASS_NAME:
+ return QUALIFIED_CLASS_NAME_EDEFAULT == null ? qualifiedClassName != null : !QUALIFIED_CLASS_NAME_EDEFAULT.equals(qualifiedClassName);
+ case GMFGraphPackage.CUSTOM_CONFIGURABLE_CLASS__BUNDLE_NAME:
+ return BUNDLE_NAME_EDEFAULT == null ? bundleName != null : !BUNDLE_NAME_EDEFAULT.equals(bundleName);
+ case GMFGraphPackage.CUSTOM_CONFIGURABLE_CLASS__ATTRIBUTES:
+ return attributes != null && !attributes.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (qualifiedClassName: ");
+ result.append(qualifiedClassName);
+ result.append(", bundleName: ");
+ result.append(bundleName);
+ result.append(')');
+ return result.toString();
+ }
+
+} //CustomConfigurableClassImpl
Index: src/org/eclipse/gmf/gmfgraph/impl/GridLayoutDataImpl.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/impl/GridLayoutDataImpl.java
diff -N src/org/eclipse/gmf/gmfgraph/impl/GridLayoutDataImpl.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/impl/GridLayoutDataImpl.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,766 @@
+/**
+ *
+ *
+ *
+ * $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.Alignment;
+import org.eclipse.gmf.gmfgraph.Dimension;
+import org.eclipse.gmf.gmfgraph.GMFGraphPackage;
+import org.eclipse.gmf.gmfgraph.GridLayoutData;
+
+import org.eclipse.gmf.gmfgraph.Layoutable;
+
+/**
+ *
+ * An implementation of the model object 'Grid Layout Data
+ * The following features are implemented:
+ *
+ * {@link org.eclipse.gmf.gmfgraph.impl.GridLayoutDataImpl#getQualifiedClassName Qualified Class Name }
+ * {@link org.eclipse.gmf.gmfgraph.impl.GridLayoutDataImpl#getBundleName Bundle Name }
+ * {@link org.eclipse.gmf.gmfgraph.impl.GridLayoutDataImpl#getOwner Owner }
+ * {@link org.eclipse.gmf.gmfgraph.impl.GridLayoutDataImpl#isGrabExcessHorizontalSpace Grab Excess Horizontal Space }
+ * {@link org.eclipse.gmf.gmfgraph.impl.GridLayoutDataImpl#isGrabExcessVerticalSpace Grab Excess Vertical Space }
+ * {@link org.eclipse.gmf.gmfgraph.impl.GridLayoutDataImpl#getVerticalAlignment Vertical Alignment }
+ * {@link org.eclipse.gmf.gmfgraph.impl.GridLayoutDataImpl#getHorizontalAlignment Horizontal Alignment }
+ * {@link org.eclipse.gmf.gmfgraph.impl.GridLayoutDataImpl#getVerticalSpan Vertical Span }
+ * {@link org.eclipse.gmf.gmfgraph.impl.GridLayoutDataImpl#getHorizontalSpan Horizontal Span }
+ * {@link org.eclipse.gmf.gmfgraph.impl.GridLayoutDataImpl#getHorizontalIndent Horizontal Indent }
+ * {@link org.eclipse.gmf.gmfgraph.impl.GridLayoutDataImpl#getSizeHint Size Hint }
+ *
+ *
+ *
+ * @generated
+ */
+public class GridLayoutDataImpl extends EObjectImpl implements GridLayoutData {
+ /**
+ * The default value of the '{@link #getQualifiedClassName() Qualified Class Name }' attribute.
+ *
+ *
+ * @see #getQualifiedClassName()
+ * @generated
+ * @ordered
+ */
+ protected static final String QUALIFIED_CLASS_NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getQualifiedClassName() Qualified Class Name }' attribute.
+ *
+ *
+ * @see #getQualifiedClassName()
+ * @generated
+ * @ordered
+ */
+ protected String qualifiedClassName = QUALIFIED_CLASS_NAME_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getBundleName() Bundle Name }' attribute.
+ *
+ *
+ * @see #getBundleName()
+ * @generated
+ * @ordered
+ */
+ protected static final String BUNDLE_NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getBundleName() Bundle Name }' attribute.
+ *
+ *
+ * @see #getBundleName()
+ * @generated
+ * @ordered
+ */
+ protected String bundleName = BUNDLE_NAME_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #isGrabExcessHorizontalSpace() Grab Excess Horizontal Space }' attribute.
+ *
+ *
+ * @see #isGrabExcessHorizontalSpace()
+ * @generated
+ * @ordered
+ */
+ protected static final boolean GRAB_EXCESS_HORIZONTAL_SPACE_EDEFAULT = false;
+
+ /**
+ * The cached value of the '{@link #isGrabExcessHorizontalSpace() Grab Excess Horizontal Space }' attribute.
+ *
+ *
+ * @see #isGrabExcessHorizontalSpace()
+ * @generated
+ * @ordered
+ */
+ protected boolean grabExcessHorizontalSpace = GRAB_EXCESS_HORIZONTAL_SPACE_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #isGrabExcessVerticalSpace() Grab Excess Vertical Space }' attribute.
+ *
+ *
+ * @see #isGrabExcessVerticalSpace()
+ * @generated
+ * @ordered
+ */
+ protected static final boolean GRAB_EXCESS_VERTICAL_SPACE_EDEFAULT = false;
+
+ /**
+ * The cached value of the '{@link #isGrabExcessVerticalSpace() Grab Excess Vertical Space }' attribute.
+ *
+ *
+ * @see #isGrabExcessVerticalSpace()
+ * @generated
+ * @ordered
+ */
+ protected boolean grabExcessVerticalSpace = GRAB_EXCESS_VERTICAL_SPACE_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getVerticalAlignment() Vertical Alignment }' attribute.
+ *
+ *
+ * @see #getVerticalAlignment()
+ * @generated
+ * @ordered
+ */
+ protected static final Alignment VERTICAL_ALIGNMENT_EDEFAULT = Alignment.CENTER_LITERAL;
+
+ /**
+ * The cached value of the '{@link #getVerticalAlignment() Vertical Alignment }' attribute.
+ *
+ *
+ * @see #getVerticalAlignment()
+ * @generated
+ * @ordered
+ */
+ protected Alignment verticalAlignment = VERTICAL_ALIGNMENT_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getHorizontalAlignment() Horizontal Alignment }' attribute.
+ *
+ *
+ * @see #getHorizontalAlignment()
+ * @generated
+ * @ordered
+ */
+ protected static final Alignment HORIZONTAL_ALIGNMENT_EDEFAULT = Alignment.CENTER_LITERAL;
+
+ /**
+ * The cached value of the '{@link #getHorizontalAlignment() Horizontal Alignment }' attribute.
+ *
+ *
+ * @see #getHorizontalAlignment()
+ * @generated
+ * @ordered
+ */
+ protected Alignment horizontalAlignment = HORIZONTAL_ALIGNMENT_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getVerticalSpan() Vertical Span }' attribute.
+ *
+ *
+ * @see #getVerticalSpan()
+ * @generated
+ * @ordered
+ */
+ protected static final int VERTICAL_SPAN_EDEFAULT = 1;
+
+ /**
+ * The cached value of the '{@link #getVerticalSpan() Vertical Span }' attribute.
+ *
+ *
+ * @see #getVerticalSpan()
+ * @generated
+ * @ordered
+ */
+ protected int verticalSpan = VERTICAL_SPAN_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getHorizontalSpan() Horizontal Span }' attribute.
+ *
+ *
+ * @see #getHorizontalSpan()
+ * @generated
+ * @ordered
+ */
+ protected static final int HORIZONTAL_SPAN_EDEFAULT = 1;
+
+ /**
+ * The cached value of the '{@link #getHorizontalSpan() Horizontal Span }' attribute.
+ *
+ *
+ * @see #getHorizontalSpan()
+ * @generated
+ * @ordered
+ */
+ protected int horizontalSpan = HORIZONTAL_SPAN_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getHorizontalIndent() Horizontal Indent }' attribute.
+ *
+ *
+ * @see #getHorizontalIndent()
+ * @generated
+ * @ordered
+ */
+ protected static final int HORIZONTAL_INDENT_EDEFAULT = 0;
+
+ /**
+ * The cached value of the '{@link #getHorizontalIndent() Horizontal Indent }' attribute.
+ *
+ *
+ * @see #getHorizontalIndent()
+ * @generated
+ * @ordered
+ */
+ protected int horizontalIndent = HORIZONTAL_INDENT_EDEFAULT;
+
+ /**
+ * The cached value of the '{@link #getSizeHint() Size Hint }' containment reference.
+ *
+ *
+ * @see #getSizeHint()
+ * @generated
+ * @ordered
+ */
+ protected Dimension sizeHint = null;
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected GridLayoutDataImpl() {
+ super();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected EClass eStaticClass() {
+ return GMFGraphPackage.eINSTANCE.getGridLayoutData();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public boolean isGrabExcessHorizontalSpace() {
+ return grabExcessHorizontalSpace;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setGrabExcessHorizontalSpace(boolean newGrabExcessHorizontalSpace) {
+ boolean oldGrabExcessHorizontalSpace = grabExcessHorizontalSpace;
+ grabExcessHorizontalSpace = newGrabExcessHorizontalSpace;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT_DATA__GRAB_EXCESS_HORIZONTAL_SPACE, oldGrabExcessHorizontalSpace, grabExcessHorizontalSpace));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public boolean isGrabExcessVerticalSpace() {
+ return grabExcessVerticalSpace;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setGrabExcessVerticalSpace(boolean newGrabExcessVerticalSpace) {
+ boolean oldGrabExcessVerticalSpace = grabExcessVerticalSpace;
+ grabExcessVerticalSpace = newGrabExcessVerticalSpace;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT_DATA__GRAB_EXCESS_VERTICAL_SPACE, oldGrabExcessVerticalSpace, grabExcessVerticalSpace));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Alignment getVerticalAlignment() {
+ return verticalAlignment;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setVerticalAlignment(Alignment newVerticalAlignment) {
+ Alignment oldVerticalAlignment = verticalAlignment;
+ verticalAlignment = newVerticalAlignment == null ? VERTICAL_ALIGNMENT_EDEFAULT : newVerticalAlignment;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT_DATA__VERTICAL_ALIGNMENT, oldVerticalAlignment, verticalAlignment));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Alignment getHorizontalAlignment() {
+ return horizontalAlignment;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setHorizontalAlignment(Alignment newHorizontalAlignment) {
+ Alignment oldHorizontalAlignment = horizontalAlignment;
+ horizontalAlignment = newHorizontalAlignment == null ? HORIZONTAL_ALIGNMENT_EDEFAULT : newHorizontalAlignment;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_ALIGNMENT, oldHorizontalAlignment, horizontalAlignment));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public int getVerticalSpan() {
+ return verticalSpan;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setVerticalSpan(int newVerticalSpan) {
+ int oldVerticalSpan = verticalSpan;
+ verticalSpan = newVerticalSpan;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT_DATA__VERTICAL_SPAN, oldVerticalSpan, verticalSpan));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public int getHorizontalSpan() {
+ return horizontalSpan;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setHorizontalSpan(int newHorizontalSpan) {
+ int oldHorizontalSpan = horizontalSpan;
+ horizontalSpan = newHorizontalSpan;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_SPAN, oldHorizontalSpan, horizontalSpan));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public int getHorizontalIndent() {
+ return horizontalIndent;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setHorizontalIndent(int newHorizontalIndent) {
+ int oldHorizontalIndent = horizontalIndent;
+ horizontalIndent = newHorizontalIndent;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_INDENT, oldHorizontalIndent, horizontalIndent));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Dimension getSizeHint() {
+ return sizeHint;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public NotificationChain basicSetSizeHint(Dimension newSizeHint, NotificationChain msgs) {
+ Dimension oldSizeHint = sizeHint;
+ sizeHint = newSizeHint;
+ if (eNotificationRequired()) {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT_DATA__SIZE_HINT, oldSizeHint, newSizeHint);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setSizeHint(Dimension newSizeHint) {
+ if (newSizeHint != sizeHint) {
+ NotificationChain msgs = null;
+ if (sizeHint != null)
+ msgs = ((InternalEObject)sizeHint).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.GRID_LAYOUT_DATA__SIZE_HINT, null, msgs);
+ if (newSizeHint != null)
+ msgs = ((InternalEObject)newSizeHint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.GRID_LAYOUT_DATA__SIZE_HINT, null, msgs);
+ msgs = basicSetSizeHint(newSizeHint, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT_DATA__SIZE_HINT, newSizeHint, newSizeHint));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case GMFGraphPackage.GRID_LAYOUT_DATA__OWNER:
+ if (eInternalContainer() != null)
+ msgs = eBasicRemoveFromContainer(msgs);
+ return eBasicSetContainer(otherEnd, GMFGraphPackage.GRID_LAYOUT_DATA__OWNER, msgs);
+ }
+ return super.eInverseAdd(otherEnd, featureID, msgs);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case GMFGraphPackage.GRID_LAYOUT_DATA__OWNER:
+ return eBasicSetContainer(null, GMFGraphPackage.GRID_LAYOUT_DATA__OWNER, msgs);
+ case GMFGraphPackage.GRID_LAYOUT_DATA__SIZE_HINT:
+ return basicSetSizeHint(null, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+ switch (eContainerFeatureID) {
+ case GMFGraphPackage.GRID_LAYOUT_DATA__OWNER:
+ return eInternalContainer().eInverseRemove(this, GMFGraphPackage.LAYOUTABLE__DATA, Layoutable.class, msgs);
+ }
+ return super.eBasicRemoveFromContainerFeature(msgs);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case GMFGraphPackage.GRID_LAYOUT_DATA__QUALIFIED_CLASS_NAME:
+ return getQualifiedClassName();
+ case GMFGraphPackage.GRID_LAYOUT_DATA__BUNDLE_NAME:
+ return getBundleName();
+ case GMFGraphPackage.GRID_LAYOUT_DATA__OWNER:
+ return getOwner();
+ case GMFGraphPackage.GRID_LAYOUT_DATA__GRAB_EXCESS_HORIZONTAL_SPACE:
+ return isGrabExcessHorizontalSpace() ? Boolean.TRUE : Boolean.FALSE;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__GRAB_EXCESS_VERTICAL_SPACE:
+ return isGrabExcessVerticalSpace() ? Boolean.TRUE : Boolean.FALSE;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__VERTICAL_ALIGNMENT:
+ return getVerticalAlignment();
+ case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_ALIGNMENT:
+ return getHorizontalAlignment();
+ case GMFGraphPackage.GRID_LAYOUT_DATA__VERTICAL_SPAN:
+ return new Integer(getVerticalSpan());
+ case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_SPAN:
+ return new Integer(getHorizontalSpan());
+ case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_INDENT:
+ return new Integer(getHorizontalIndent());
+ case GMFGraphPackage.GRID_LAYOUT_DATA__SIZE_HINT:
+ return getSizeHint();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case GMFGraphPackage.GRID_LAYOUT_DATA__QUALIFIED_CLASS_NAME:
+ setQualifiedClassName((String)newValue);
+ return;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__BUNDLE_NAME:
+ setBundleName((String)newValue);
+ return;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__OWNER:
+ setOwner((Layoutable)newValue);
+ return;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__GRAB_EXCESS_HORIZONTAL_SPACE:
+ setGrabExcessHorizontalSpace(((Boolean)newValue).booleanValue());
+ return;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__GRAB_EXCESS_VERTICAL_SPACE:
+ setGrabExcessVerticalSpace(((Boolean)newValue).booleanValue());
+ return;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__VERTICAL_ALIGNMENT:
+ setVerticalAlignment((Alignment)newValue);
+ return;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_ALIGNMENT:
+ setHorizontalAlignment((Alignment)newValue);
+ return;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__VERTICAL_SPAN:
+ setVerticalSpan(((Integer)newValue).intValue());
+ return;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_SPAN:
+ setHorizontalSpan(((Integer)newValue).intValue());
+ return;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_INDENT:
+ setHorizontalIndent(((Integer)newValue).intValue());
+ return;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__SIZE_HINT:
+ setSizeHint((Dimension)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case GMFGraphPackage.GRID_LAYOUT_DATA__QUALIFIED_CLASS_NAME:
+ setQualifiedClassName(QUALIFIED_CLASS_NAME_EDEFAULT);
+ return;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__BUNDLE_NAME:
+ setBundleName(BUNDLE_NAME_EDEFAULT);
+ return;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__OWNER:
+ setOwner((Layoutable)null);
+ return;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__GRAB_EXCESS_HORIZONTAL_SPACE:
+ setGrabExcessHorizontalSpace(GRAB_EXCESS_HORIZONTAL_SPACE_EDEFAULT);
+ return;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__GRAB_EXCESS_VERTICAL_SPACE:
+ setGrabExcessVerticalSpace(GRAB_EXCESS_VERTICAL_SPACE_EDEFAULT);
+ return;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__VERTICAL_ALIGNMENT:
+ setVerticalAlignment(VERTICAL_ALIGNMENT_EDEFAULT);
+ return;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_ALIGNMENT:
+ setHorizontalAlignment(HORIZONTAL_ALIGNMENT_EDEFAULT);
+ return;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__VERTICAL_SPAN:
+ setVerticalSpan(VERTICAL_SPAN_EDEFAULT);
+ return;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_SPAN:
+ setHorizontalSpan(HORIZONTAL_SPAN_EDEFAULT);
+ return;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_INDENT:
+ setHorizontalIndent(HORIZONTAL_INDENT_EDEFAULT);
+ return;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__SIZE_HINT:
+ setSizeHint((Dimension)null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case GMFGraphPackage.GRID_LAYOUT_DATA__QUALIFIED_CLASS_NAME:
+ return QUALIFIED_CLASS_NAME_EDEFAULT == null ? qualifiedClassName != null : !QUALIFIED_CLASS_NAME_EDEFAULT.equals(qualifiedClassName);
+ case GMFGraphPackage.GRID_LAYOUT_DATA__BUNDLE_NAME:
+ return BUNDLE_NAME_EDEFAULT == null ? bundleName != null : !BUNDLE_NAME_EDEFAULT.equals(bundleName);
+ case GMFGraphPackage.GRID_LAYOUT_DATA__OWNER:
+ return getOwner() != null;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__GRAB_EXCESS_HORIZONTAL_SPACE:
+ return grabExcessHorizontalSpace != GRAB_EXCESS_HORIZONTAL_SPACE_EDEFAULT;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__GRAB_EXCESS_VERTICAL_SPACE:
+ return grabExcessVerticalSpace != GRAB_EXCESS_VERTICAL_SPACE_EDEFAULT;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__VERTICAL_ALIGNMENT:
+ return verticalAlignment != VERTICAL_ALIGNMENT_EDEFAULT;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_ALIGNMENT:
+ return horizontalAlignment != HORIZONTAL_ALIGNMENT_EDEFAULT;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__VERTICAL_SPAN:
+ return verticalSpan != VERTICAL_SPAN_EDEFAULT;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_SPAN:
+ return horizontalSpan != HORIZONTAL_SPAN_EDEFAULT;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_INDENT:
+ return horizontalIndent != HORIZONTAL_INDENT_EDEFAULT;
+ case GMFGraphPackage.GRID_LAYOUT_DATA__SIZE_HINT:
+ return sizeHint != null;
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (qualifiedClassName: ");
+ result.append(qualifiedClassName);
+ result.append(", bundleName: ");
+ result.append(bundleName);
+ result.append(", grabExcessHorizontalSpace: ");
+ result.append(grabExcessHorizontalSpace);
+ result.append(", grabExcessVerticalSpace: ");
+ result.append(grabExcessVerticalSpace);
+ result.append(", verticalAlignment: ");
+ result.append(verticalAlignment);
+ result.append(", horizontalAlignment: ");
+ result.append(horizontalAlignment);
+ result.append(", verticalSpan: ");
+ result.append(verticalSpan);
+ result.append(", horizontalSpan: ");
+ result.append(horizontalSpan);
+ result.append(", horizontalIndent: ");
+ result.append(horizontalIndent);
+ result.append(')');
+ return result.toString();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String getQualifiedClassNameGen() {
+ return qualifiedClassName;
+ }
+
+ /**
+ * @generated NOT
+ */
+ public String getQualifiedClassName() {
+ return "org.eclipse.gmf.internal.codegen.draw2d.GridLayoutData";
+ }
+
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setQualifiedClassNameGen(String newQualifiedClassName) {
+ String oldQualifiedClassName = qualifiedClassName;
+ qualifiedClassName = newQualifiedClassName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT_DATA__QUALIFIED_CLASS_NAME, oldQualifiedClassName, qualifiedClassName));
+ }
+
+ /**
+ * @generated NOT
+ */
+ public void setQualifiedClassName(String newQualifiedClassName) {
+ //throw new UnsupportedOperationException("You can not change predefined name of implementation class");
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String getBundleName() {
+ return bundleName;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setBundleName(String newBundleName) {
+ String oldBundleName = bundleName;
+ bundleName = newBundleName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT_DATA__BUNDLE_NAME, oldBundleName, bundleName));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Layoutable getOwner() {
+ if (eContainerFeatureID != GMFGraphPackage.GRID_LAYOUT_DATA__OWNER) return null;
+ return (Layoutable)eContainer();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setOwner(Layoutable newOwner) {
+ if (newOwner != eInternalContainer() || (eContainerFeatureID != GMFGraphPackage.GRID_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__DATA, Layoutable.class, msgs);
+ msgs = eBasicSetContainer((InternalEObject)newOwner, GMFGraphPackage.GRID_LAYOUT_DATA__OWNER, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT_DATA__OWNER, newOwner, newOwner));
+ }
+
+} //GridLayoutDataImpl
Index: src/org/eclipse/gmf/gmfgraph/impl/CustomAttributeImpl.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/impl/CustomAttributeImpl.java
diff -N src/org/eclipse/gmf/gmfgraph/impl/CustomAttributeImpl.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/impl/CustomAttributeImpl.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,377 @@
+/**
+ *
+ *
+ *
+ * $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.CustomAttribute;
+import org.eclipse.gmf.gmfgraph.GMFGraphPackage;
+
+/**
+ *
+ * An implementation of the model object 'Custom Attribute
+ * The following features are implemented:
+ *
+ * {@link org.eclipse.gmf.gmfgraph.impl.CustomAttributeImpl#getName Name }
+ * {@link org.eclipse.gmf.gmfgraph.impl.CustomAttributeImpl#getType Type }
+ * {@link org.eclipse.gmf.gmfgraph.impl.CustomAttributeImpl#getValue Value }
+ * {@link org.eclipse.gmf.gmfgraph.impl.CustomAttributeImpl#isDirectAccess Direct Access }
+ * {@link org.eclipse.gmf.gmfgraph.impl.CustomAttributeImpl#isMultiStatementValue Multi Statement Value }
+ *
+ *
+ *
+ * @generated
+ */
+public class CustomAttributeImpl extends EObjectImpl implements CustomAttribute {
+ /**
+ * The default value of the '{@link #getName() Name }' attribute.
+ *
+ *
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected static final String NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getName() Name }' attribute.
+ *
+ *
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected String name = NAME_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getType() Type }' attribute.
+ *
+ *
+ * @see #getType()
+ * @generated
+ * @ordered
+ */
+ protected static final String TYPE_EDEFAULT = "Object";
+
+ /**
+ * The cached value of the '{@link #getType() Type }' attribute.
+ *
+ *
+ * @see #getType()
+ * @generated
+ * @ordered
+ */
+ protected String type = TYPE_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getValue() Value }' attribute.
+ *
+ *
+ * @see #getValue()
+ * @generated
+ * @ordered
+ */
+ protected static final String VALUE_EDEFAULT = "null";
+
+ /**
+ * The cached value of the '{@link #getValue() Value }' attribute.
+ *
+ *
+ * @see #getValue()
+ * @generated
+ * @ordered
+ */
+ protected String value = VALUE_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #isDirectAccess() Direct Access }' attribute.
+ *
+ *
+ * @see #isDirectAccess()
+ * @generated
+ * @ordered
+ */
+ protected static final boolean DIRECT_ACCESS_EDEFAULT = false;
+
+ /**
+ * The cached value of the '{@link #isDirectAccess() Direct Access }' attribute.
+ *
+ *
+ * @see #isDirectAccess()
+ * @generated
+ * @ordered
+ */
+ protected boolean directAccess = DIRECT_ACCESS_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #isMultiStatementValue() Multi Statement Value }' attribute.
+ *
+ *
+ * @see #isMultiStatementValue()
+ * @generated
+ * @ordered
+ */
+ protected static final boolean MULTI_STATEMENT_VALUE_EDEFAULT = false;
+
+ /**
+ * The cached value of the '{@link #isMultiStatementValue() Multi Statement Value }' attribute.
+ *
+ *
+ * @see #isMultiStatementValue()
+ * @generated
+ * @ordered
+ */
+ protected boolean multiStatementValue = MULTI_STATEMENT_VALUE_EDEFAULT;
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected CustomAttributeImpl() {
+ super();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected EClass eStaticClass() {
+ return GMFGraphPackage.eINSTANCE.getCustomAttribute();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setName(String newName) {
+ String oldName = name;
+ name = newName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CUSTOM_ATTRIBUTE__NAME, oldName, name));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String getType() {
+ return type;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setType(String newType) {
+ String oldType = type;
+ type = newType;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CUSTOM_ATTRIBUTE__TYPE, oldType, type));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String getValue() {
+ return value;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setValue(String newValue) {
+ String oldValue = value;
+ value = newValue;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CUSTOM_ATTRIBUTE__VALUE, oldValue, value));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public boolean isDirectAccess() {
+ return directAccess;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setDirectAccess(boolean newDirectAccess) {
+ boolean oldDirectAccess = directAccess;
+ directAccess = newDirectAccess;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CUSTOM_ATTRIBUTE__DIRECT_ACCESS, oldDirectAccess, directAccess));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public boolean isMultiStatementValue() {
+ return multiStatementValue;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setMultiStatementValue(boolean newMultiStatementValue) {
+ boolean oldMultiStatementValue = multiStatementValue;
+ multiStatementValue = newMultiStatementValue;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CUSTOM_ATTRIBUTE__MULTI_STATEMENT_VALUE, oldMultiStatementValue, multiStatementValue));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case GMFGraphPackage.CUSTOM_ATTRIBUTE__NAME:
+ return getName();
+ case GMFGraphPackage.CUSTOM_ATTRIBUTE__TYPE:
+ return getType();
+ case GMFGraphPackage.CUSTOM_ATTRIBUTE__VALUE:
+ return getValue();
+ case GMFGraphPackage.CUSTOM_ATTRIBUTE__DIRECT_ACCESS:
+ return isDirectAccess() ? Boolean.TRUE : Boolean.FALSE;
+ case GMFGraphPackage.CUSTOM_ATTRIBUTE__MULTI_STATEMENT_VALUE:
+ return isMultiStatementValue() ? Boolean.TRUE : Boolean.FALSE;
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case GMFGraphPackage.CUSTOM_ATTRIBUTE__NAME:
+ setName((String)newValue);
+ return;
+ case GMFGraphPackage.CUSTOM_ATTRIBUTE__TYPE:
+ setType((String)newValue);
+ return;
+ case GMFGraphPackage.CUSTOM_ATTRIBUTE__VALUE:
+ setValue((String)newValue);
+ return;
+ case GMFGraphPackage.CUSTOM_ATTRIBUTE__DIRECT_ACCESS:
+ setDirectAccess(((Boolean)newValue).booleanValue());
+ return;
+ case GMFGraphPackage.CUSTOM_ATTRIBUTE__MULTI_STATEMENT_VALUE:
+ setMultiStatementValue(((Boolean)newValue).booleanValue());
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case GMFGraphPackage.CUSTOM_ATTRIBUTE__NAME:
+ setName(NAME_EDEFAULT);
+ return;
+ case GMFGraphPackage.CUSTOM_ATTRIBUTE__TYPE:
+ setType(TYPE_EDEFAULT);
+ return;
+ case GMFGraphPackage.CUSTOM_ATTRIBUTE__VALUE:
+ setValue(VALUE_EDEFAULT);
+ return;
+ case GMFGraphPackage.CUSTOM_ATTRIBUTE__DIRECT_ACCESS:
+ setDirectAccess(DIRECT_ACCESS_EDEFAULT);
+ return;
+ case GMFGraphPackage.CUSTOM_ATTRIBUTE__MULTI_STATEMENT_VALUE:
+ setMultiStatementValue(MULTI_STATEMENT_VALUE_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case GMFGraphPackage.CUSTOM_ATTRIBUTE__NAME:
+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+ case GMFGraphPackage.CUSTOM_ATTRIBUTE__TYPE:
+ return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+ case GMFGraphPackage.CUSTOM_ATTRIBUTE__VALUE:
+ return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+ case GMFGraphPackage.CUSTOM_ATTRIBUTE__DIRECT_ACCESS:
+ return directAccess != DIRECT_ACCESS_EDEFAULT;
+ case GMFGraphPackage.CUSTOM_ATTRIBUTE__MULTI_STATEMENT_VALUE:
+ return multiStatementValue != MULTI_STATEMENT_VALUE_EDEFAULT;
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (name: ");
+ result.append(name);
+ result.append(", type: ");
+ result.append(type);
+ result.append(", value: ");
+ result.append(value);
+ result.append(", directAccess: ");
+ result.append(directAccess);
+ result.append(", multiStatementValue: ");
+ result.append(multiStatementValue);
+ result.append(')');
+ return result.toString();
+ }
+
+} //CustomAttributeImpl
Index: src/org/eclipse/gmf/gmfgraph/impl/CustomLayoutDataImpl.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/impl/CustomLayoutDataImpl.java
diff -N src/org/eclipse/gmf/gmfgraph/impl/CustomLayoutDataImpl.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/impl/CustomLayoutDataImpl.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,303 @@
+/**
+ *
+ *
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+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.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.gmf.gmfgraph.CustomAttribute;
+import org.eclipse.gmf.gmfgraph.CustomConfigurableClass;
+import org.eclipse.gmf.gmfgraph.CustomLayoutData;
+import org.eclipse.gmf.gmfgraph.GMFGraphPackage;
+
+/**
+ *
+ * An implementation of the model object 'Custom Layout Data
+ * The following features are implemented:
+ *
+ * {@link org.eclipse.gmf.gmfgraph.impl.CustomLayoutDataImpl#getQualifiedClassName Qualified Class Name }
+ * {@link org.eclipse.gmf.gmfgraph.impl.CustomLayoutDataImpl#getBundleName Bundle Name }
+ * {@link org.eclipse.gmf.gmfgraph.impl.CustomLayoutDataImpl#getAttributes Attributes }
+ *
+ *
+ *
+ * @generated
+ */
+public class CustomLayoutDataImpl extends EObjectImpl implements CustomLayoutData {
+ /**
+ * The default value of the '{@link #getQualifiedClassName() Qualified Class Name }' attribute.
+ *
+ *
+ * @see #getQualifiedClassName()
+ * @generated
+ * @ordered
+ */
+ protected static final String QUALIFIED_CLASS_NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getQualifiedClassName() Qualified Class Name }' attribute.
+ *
+ *
+ * @see #getQualifiedClassName()
+ * @generated
+ * @ordered
+ */
+ protected String qualifiedClassName = QUALIFIED_CLASS_NAME_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getBundleName() Bundle Name }' attribute.
+ *
+ *
+ * @see #getBundleName()
+ * @generated
+ * @ordered
+ */
+ protected static final String BUNDLE_NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getBundleName() Bundle Name }' attribute.
+ *
+ *
+ * @see #getBundleName()
+ * @generated
+ * @ordered
+ */
+ protected String bundleName = BUNDLE_NAME_EDEFAULT;
+
+ /**
+ * The cached value of the '{@link #getAttributes() Attributes }' containment reference list.
+ *
+ *
+ * @see #getAttributes()
+ * @generated
+ * @ordered
+ */
+ protected EList attributes = null;
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected CustomLayoutDataImpl() {
+ super();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected EClass eStaticClass() {
+ return GMFGraphPackage.eINSTANCE.getCustomLayoutData();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String getQualifiedClassName() {
+ return qualifiedClassName;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setQualifiedClassName(String newQualifiedClassName) {
+ String oldQualifiedClassName = qualifiedClassName;
+ qualifiedClassName = newQualifiedClassName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CUSTOM_LAYOUT_DATA__QUALIFIED_CLASS_NAME, oldQualifiedClassName, qualifiedClassName));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String getBundleName() {
+ return bundleName;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setBundleName(String newBundleName) {
+ String oldBundleName = bundleName;
+ bundleName = newBundleName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CUSTOM_LAYOUT_DATA__BUNDLE_NAME, oldBundleName, bundleName));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public EList getAttributes() {
+ if (attributes == null) {
+ attributes = new EObjectContainmentEList(CustomAttribute.class, this, GMFGraphPackage.CUSTOM_LAYOUT_DATA__ATTRIBUTES);
+ }
+ return attributes;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case GMFGraphPackage.CUSTOM_LAYOUT_DATA__ATTRIBUTES:
+ return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case GMFGraphPackage.CUSTOM_LAYOUT_DATA__QUALIFIED_CLASS_NAME:
+ return getQualifiedClassName();
+ case GMFGraphPackage.CUSTOM_LAYOUT_DATA__BUNDLE_NAME:
+ return getBundleName();
+ case GMFGraphPackage.CUSTOM_LAYOUT_DATA__ATTRIBUTES:
+ return getAttributes();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case GMFGraphPackage.CUSTOM_LAYOUT_DATA__QUALIFIED_CLASS_NAME:
+ setQualifiedClassName((String)newValue);
+ return;
+ case GMFGraphPackage.CUSTOM_LAYOUT_DATA__BUNDLE_NAME:
+ setBundleName((String)newValue);
+ return;
+ case GMFGraphPackage.CUSTOM_LAYOUT_DATA__ATTRIBUTES:
+ getAttributes().clear();
+ getAttributes().addAll((Collection)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case GMFGraphPackage.CUSTOM_LAYOUT_DATA__QUALIFIED_CLASS_NAME:
+ setQualifiedClassName(QUALIFIED_CLASS_NAME_EDEFAULT);
+ return;
+ case GMFGraphPackage.CUSTOM_LAYOUT_DATA__BUNDLE_NAME:
+ setBundleName(BUNDLE_NAME_EDEFAULT);
+ return;
+ case GMFGraphPackage.CUSTOM_LAYOUT_DATA__ATTRIBUTES:
+ getAttributes().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case GMFGraphPackage.CUSTOM_LAYOUT_DATA__QUALIFIED_CLASS_NAME:
+ return QUALIFIED_CLASS_NAME_EDEFAULT == null ? qualifiedClassName != null : !QUALIFIED_CLASS_NAME_EDEFAULT.equals(qualifiedClassName);
+ case GMFGraphPackage.CUSTOM_LAYOUT_DATA__BUNDLE_NAME:
+ return BUNDLE_NAME_EDEFAULT == null ? bundleName != null : !BUNDLE_NAME_EDEFAULT.equals(bundleName);
+ case GMFGraphPackage.CUSTOM_LAYOUT_DATA__ATTRIBUTES:
+ return attributes != null && !attributes.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
+ if (baseClass == CustomConfigurableClass.class) {
+ switch (derivedFeatureID) {
+ case GMFGraphPackage.CUSTOM_LAYOUT_DATA__ATTRIBUTES: return GMFGraphPackage.CUSTOM_CONFIGURABLE_CLASS__ATTRIBUTES;
+ default: return -1;
+ }
+ }
+ return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
+ if (baseClass == CustomConfigurableClass.class) {
+ switch (baseFeatureID) {
+ case GMFGraphPackage.CUSTOM_CONFIGURABLE_CLASS__ATTRIBUTES: return GMFGraphPackage.CUSTOM_LAYOUT_DATA__ATTRIBUTES;
+ default: return -1;
+ }
+ }
+ return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (qualifiedClassName: ");
+ result.append(qualifiedClassName);
+ result.append(", bundleName: ");
+ result.append(bundleName);
+ result.append(')');
+ return result.toString();
+ }
+
+} //CustomLayoutDataImpl
Index: src/org/eclipse/gmf/gmfgraph/GridLayoutData.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/GridLayoutData.java
diff -N src/org/eclipse/gmf/gmfgraph/GridLayoutData.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/GridLayoutData.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,254 @@
+/**
+ *
+ *
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph;
+
+
+/**
+ *
+ * A representation of the model object 'Grid Layout Data
+ * The following features are supported:
+ *
+ * {@link org.eclipse.gmf.gmfgraph.GridLayoutData#isGrabExcessHorizontalSpace Grab Excess Horizontal Space }
+ * {@link org.eclipse.gmf.gmfgraph.GridLayoutData#isGrabExcessVerticalSpace Grab Excess Vertical Space }
+ * {@link org.eclipse.gmf.gmfgraph.GridLayoutData#getVerticalAlignment Vertical Alignment }
+ * {@link org.eclipse.gmf.gmfgraph.GridLayoutData#getHorizontalAlignment Horizontal Alignment }
+ * {@link org.eclipse.gmf.gmfgraph.GridLayoutData#getVerticalSpan Vertical Span }
+ * {@link org.eclipse.gmf.gmfgraph.GridLayoutData#getHorizontalSpan Horizontal Span }
+ * {@link org.eclipse.gmf.gmfgraph.GridLayoutData#getHorizontalIndent Horizontal Indent }
+ * {@link org.eclipse.gmf.gmfgraph.GridLayoutData#getSizeHint Size Hint }
+ *
+ *
+ *
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getGridLayoutData()
+ * @model
+ * @generated
+ */
+public interface GridLayoutData extends LayoutData {
+ /**
+ * Returns the value of the 'Grab Excess Horizontal Space "false".
+ *
+ *
+ * If the meaning of the 'Grab Excess Horizontal Space ' attribute isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Grab Excess Horizontal Space ' attribute.
+ * @see #setGrabExcessHorizontalSpace(boolean)
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getGridLayoutData_GrabExcessHorizontalSpace()
+ * @model default="false" required="true"
+ * @generated
+ */
+ boolean isGrabExcessHorizontalSpace();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.GridLayoutData#isGrabExcessHorizontalSpace Grab Excess Horizontal Space }' attribute.
+ *
+ *
+ * @param value the new value of the 'Grab Excess Horizontal Space ' attribute.
+ * @see #isGrabExcessHorizontalSpace()
+ * @generated
+ */
+ void setGrabExcessHorizontalSpace(boolean value);
+
+ /**
+ * Returns the value of the 'Grab Excess Vertical Space "false".
+ *
+ *
+ * If the meaning of the 'Grab Excess Vertical Space ' attribute isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Grab Excess Vertical Space ' attribute.
+ * @see #setGrabExcessVerticalSpace(boolean)
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getGridLayoutData_GrabExcessVerticalSpace()
+ * @model default="false" required="true"
+ * @generated
+ */
+ boolean isGrabExcessVerticalSpace();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.GridLayoutData#isGrabExcessVerticalSpace Grab Excess Vertical Space }' attribute.
+ *
+ *
+ * @param value the new value of the 'Grab Excess Vertical Space ' attribute.
+ * @see #isGrabExcessVerticalSpace()
+ * @generated
+ */
+ void setGrabExcessVerticalSpace(boolean value);
+
+ /**
+ * Returns the value of the 'Vertical Alignment "CENTER".
+ * The literals are from the enumeration {@link org.eclipse.gmf.gmfgraph.Alignment}.
+ *
+ *
+ * If the meaning of the 'Vertical Alignment ' attribute isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Vertical Alignment ' attribute.
+ * @see org.eclipse.gmf.gmfgraph.Alignment
+ * @see #setVerticalAlignment(Alignment)
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getGridLayoutData_VerticalAlignment()
+ * @model default="CENTER" required="true"
+ * @generated
+ */
+ Alignment getVerticalAlignment();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.GridLayoutData#getVerticalAlignment Vertical Alignment }' attribute.
+ *
+ *
+ * @param value the new value of the 'Vertical Alignment ' attribute.
+ * @see org.eclipse.gmf.gmfgraph.Alignment
+ * @see #getVerticalAlignment()
+ * @generated
+ */
+ void setVerticalAlignment(Alignment value);
+
+ /**
+ * Returns the value of the 'Horizontal Alignment "CENTER".
+ * The literals are from the enumeration {@link org.eclipse.gmf.gmfgraph.Alignment}.
+ *
+ *
+ * If the meaning of the 'Horizontal Alignment ' attribute isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Horizontal Alignment ' attribute.
+ * @see org.eclipse.gmf.gmfgraph.Alignment
+ * @see #setHorizontalAlignment(Alignment)
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getGridLayoutData_HorizontalAlignment()
+ * @model default="CENTER" required="true"
+ * @generated
+ */
+ Alignment getHorizontalAlignment();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.GridLayoutData#getHorizontalAlignment Horizontal Alignment }' attribute.
+ *
+ *
+ * @param value the new value of the 'Horizontal Alignment ' attribute.
+ * @see org.eclipse.gmf.gmfgraph.Alignment
+ * @see #getHorizontalAlignment()
+ * @generated
+ */
+ void setHorizontalAlignment(Alignment value);
+
+ /**
+ * Returns the value of the 'Vertical Span "1".
+ *
+ *
+ * If the meaning of the 'Vertical Span ' attribute isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Vertical Span ' attribute.
+ * @see #setVerticalSpan(int)
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getGridLayoutData_VerticalSpan()
+ * @model default="1" required="true"
+ * @generated
+ */
+ int getVerticalSpan();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.GridLayoutData#getVerticalSpan Vertical Span }' attribute.
+ *
+ *
+ * @param value the new value of the 'Vertical Span ' attribute.
+ * @see #getVerticalSpan()
+ * @generated
+ */
+ void setVerticalSpan(int value);
+
+ /**
+ * Returns the value of the 'Horizontal Span "1".
+ *
+ *
+ * If the meaning of the 'Horizontal Span ' attribute isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Horizontal Span ' attribute.
+ * @see #setHorizontalSpan(int)
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getGridLayoutData_HorizontalSpan()
+ * @model default="1" required="true"
+ * @generated
+ */
+ int getHorizontalSpan();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.GridLayoutData#getHorizontalSpan Horizontal Span }' attribute.
+ *
+ *
+ * @param value the new value of the 'Horizontal Span ' attribute.
+ * @see #getHorizontalSpan()
+ * @generated
+ */
+ void setHorizontalSpan(int value);
+
+ /**
+ * Returns the value of the 'Horizontal Indent
+ * If the meaning of the 'Horizontal Indent ' attribute isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Horizontal Indent ' attribute.
+ * @see #setHorizontalIndent(int)
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getGridLayoutData_HorizontalIndent()
+ * @model required="true"
+ * @generated
+ */
+ int getHorizontalIndent();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.GridLayoutData#getHorizontalIndent Horizontal Indent }' attribute.
+ *
+ *
+ * @param value the new value of the 'Horizontal Indent ' attribute.
+ * @see #getHorizontalIndent()
+ * @generated
+ */
+ void setHorizontalIndent(int value);
+
+ /**
+ * Returns the value of the 'Size Hint
+ * If the meaning of the 'Size Hint ' containment reference isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Size Hint ' containment reference.
+ * @see #setSizeHint(Dimension)
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getGridLayoutData_SizeHint()
+ * @model containment="true"
+ * @generated
+ */
+ Dimension getSizeHint();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.GridLayoutData#getSizeHint Size Hint }' containment reference.
+ *
+ *
+ * @param value the new value of the 'Size Hint ' containment reference.
+ * @see #getSizeHint()
+ * @generated
+ */
+ void setSizeHint(Dimension value);
+
+} // GridLayoutData
Index: src/org/eclipse/gmf/gmfgraph/impl/GridLayoutImpl.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/impl/GridLayoutImpl.java
diff -N src/org/eclipse/gmf/gmfgraph/impl/GridLayoutImpl.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/impl/GridLayoutImpl.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,485 @@
+/**
+ *
+ *
+ *
+ * $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.gmf.gmfgraph.CustomClass;
+import org.eclipse.gmf.gmfgraph.Dimension;
+import org.eclipse.gmf.gmfgraph.GMFGraphPackage;
+import org.eclipse.gmf.gmfgraph.GridLayout;
+
+/**
+ *
+ * An implementation of the model object 'Grid Layout
+ * The following features are implemented:
+ *
+ * {@link org.eclipse.gmf.gmfgraph.impl.GridLayoutImpl#getQualifiedClassName Qualified Class Name }
+ * {@link org.eclipse.gmf.gmfgraph.impl.GridLayoutImpl#getBundleName Bundle Name }
+ * {@link org.eclipse.gmf.gmfgraph.impl.GridLayoutImpl#getNumColumns Num Columns }
+ * {@link org.eclipse.gmf.gmfgraph.impl.GridLayoutImpl#isEqualWidth Equal Width }
+ * {@link org.eclipse.gmf.gmfgraph.impl.GridLayoutImpl#getMargins Margins }
+ * {@link org.eclipse.gmf.gmfgraph.impl.GridLayoutImpl#getSpacing Spacing }
+ *
+ *
+ *
+ * @generated
+ */
+public class GridLayoutImpl extends EObjectImpl implements GridLayout {
+ /**
+ * The default value of the '{@link #getQualifiedClassName() Qualified Class Name }' attribute.
+ *
+ *
+ * @see #getQualifiedClassName()
+ * @generated
+ * @ordered
+ */
+ protected static final String QUALIFIED_CLASS_NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getQualifiedClassName() Qualified Class Name }' attribute.
+ *
+ *
+ * @see #getQualifiedClassName()
+ * @generated
+ * @ordered
+ */
+ protected String qualifiedClassName = QUALIFIED_CLASS_NAME_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getBundleName() Bundle Name }' attribute.
+ *
+ *
+ * @see #getBundleName()
+ * @generated
+ * @ordered
+ */
+ protected static final String BUNDLE_NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getBundleName() Bundle Name }' attribute.
+ *
+ *
+ * @see #getBundleName()
+ * @generated
+ * @ordered
+ */
+ protected String bundleName = BUNDLE_NAME_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getNumColumns() Num Columns }' attribute.
+ *
+ *
+ * @see #getNumColumns()
+ * @generated
+ * @ordered
+ */
+ protected static final int NUM_COLUMNS_EDEFAULT = 1;
+
+ /**
+ * The cached value of the '{@link #getNumColumns() Num Columns }' attribute.
+ *
+ *
+ * @see #getNumColumns()
+ * @generated
+ * @ordered
+ */
+ protected int numColumns = NUM_COLUMNS_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #isEqualWidth() Equal Width }' attribute.
+ *
+ *
+ * @see #isEqualWidth()
+ * @generated
+ * @ordered
+ */
+ protected static final boolean EQUAL_WIDTH_EDEFAULT = true;
+
+ /**
+ * The cached value of the '{@link #isEqualWidth() Equal Width }' attribute.
+ *
+ *
+ * @see #isEqualWidth()
+ * @generated
+ * @ordered
+ */
+ protected boolean equalWidth = EQUAL_WIDTH_EDEFAULT;
+
+ /**
+ * The cached value of the '{@link #getMargins() Margins }' containment reference.
+ *
+ *
+ * @see #getMargins()
+ * @generated
+ * @ordered
+ */
+ protected Dimension margins = null;
+
+ /**
+ * The cached value of the '{@link #getSpacing() Spacing }' containment reference.
+ *
+ *
+ * @see #getSpacing()
+ * @generated
+ * @ordered
+ */
+ protected Dimension spacing = null;
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected GridLayoutImpl() {
+ super();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected EClass eStaticClass() {
+ return GMFGraphPackage.eINSTANCE.getGridLayout();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public int getNumColumns() {
+ return numColumns;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setNumColumns(int newNumColumns) {
+ int oldNumColumns = numColumns;
+ numColumns = newNumColumns;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT__NUM_COLUMNS, oldNumColumns, numColumns));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public boolean isEqualWidth() {
+ return equalWidth;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setEqualWidth(boolean newEqualWidth) {
+ boolean oldEqualWidth = equalWidth;
+ equalWidth = newEqualWidth;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT__EQUAL_WIDTH, oldEqualWidth, equalWidth));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Dimension getMargins() {
+ return margins;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public NotificationChain basicSetMargins(Dimension newMargins, NotificationChain msgs) {
+ Dimension oldMargins = margins;
+ margins = newMargins;
+ if (eNotificationRequired()) {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT__MARGINS, oldMargins, newMargins);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setMargins(Dimension newMargins) {
+ if (newMargins != margins) {
+ NotificationChain msgs = null;
+ if (margins != null)
+ msgs = ((InternalEObject)margins).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.GRID_LAYOUT__MARGINS, null, msgs);
+ if (newMargins != null)
+ msgs = ((InternalEObject)newMargins).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.GRID_LAYOUT__MARGINS, null, msgs);
+ msgs = basicSetMargins(newMargins, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT__MARGINS, newMargins, newMargins));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Dimension getSpacing() {
+ return spacing;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public NotificationChain basicSetSpacing(Dimension newSpacing, NotificationChain msgs) {
+ Dimension oldSpacing = spacing;
+ spacing = newSpacing;
+ if (eNotificationRequired()) {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT__SPACING, oldSpacing, newSpacing);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setSpacing(Dimension newSpacing) {
+ if (newSpacing != spacing) {
+ NotificationChain msgs = null;
+ if (spacing != null)
+ msgs = ((InternalEObject)spacing).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.GRID_LAYOUT__SPACING, null, msgs);
+ if (newSpacing != null)
+ msgs = ((InternalEObject)newSpacing).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.GRID_LAYOUT__SPACING, null, msgs);
+ msgs = basicSetSpacing(newSpacing, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT__SPACING, newSpacing, newSpacing));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case GMFGraphPackage.GRID_LAYOUT__MARGINS:
+ return basicSetMargins(null, msgs);
+ case GMFGraphPackage.GRID_LAYOUT__SPACING:
+ return basicSetSpacing(null, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case GMFGraphPackage.GRID_LAYOUT__QUALIFIED_CLASS_NAME:
+ return getQualifiedClassName();
+ case GMFGraphPackage.GRID_LAYOUT__BUNDLE_NAME:
+ return getBundleName();
+ case GMFGraphPackage.GRID_LAYOUT__NUM_COLUMNS:
+ return new Integer(getNumColumns());
+ case GMFGraphPackage.GRID_LAYOUT__EQUAL_WIDTH:
+ return isEqualWidth() ? Boolean.TRUE : Boolean.FALSE;
+ case GMFGraphPackage.GRID_LAYOUT__MARGINS:
+ return getMargins();
+ case GMFGraphPackage.GRID_LAYOUT__SPACING:
+ return getSpacing();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case GMFGraphPackage.GRID_LAYOUT__QUALIFIED_CLASS_NAME:
+ setQualifiedClassName((String)newValue);
+ return;
+ case GMFGraphPackage.GRID_LAYOUT__BUNDLE_NAME:
+ setBundleName((String)newValue);
+ return;
+ case GMFGraphPackage.GRID_LAYOUT__NUM_COLUMNS:
+ setNumColumns(((Integer)newValue).intValue());
+ return;
+ case GMFGraphPackage.GRID_LAYOUT__EQUAL_WIDTH:
+ setEqualWidth(((Boolean)newValue).booleanValue());
+ return;
+ case GMFGraphPackage.GRID_LAYOUT__MARGINS:
+ setMargins((Dimension)newValue);
+ return;
+ case GMFGraphPackage.GRID_LAYOUT__SPACING:
+ setSpacing((Dimension)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case GMFGraphPackage.GRID_LAYOUT__QUALIFIED_CLASS_NAME:
+ setQualifiedClassName(QUALIFIED_CLASS_NAME_EDEFAULT);
+ return;
+ case GMFGraphPackage.GRID_LAYOUT__BUNDLE_NAME:
+ setBundleName(BUNDLE_NAME_EDEFAULT);
+ return;
+ case GMFGraphPackage.GRID_LAYOUT__NUM_COLUMNS:
+ setNumColumns(NUM_COLUMNS_EDEFAULT);
+ return;
+ case GMFGraphPackage.GRID_LAYOUT__EQUAL_WIDTH:
+ setEqualWidth(EQUAL_WIDTH_EDEFAULT);
+ return;
+ case GMFGraphPackage.GRID_LAYOUT__MARGINS:
+ setMargins((Dimension)null);
+ return;
+ case GMFGraphPackage.GRID_LAYOUT__SPACING:
+ setSpacing((Dimension)null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case GMFGraphPackage.GRID_LAYOUT__QUALIFIED_CLASS_NAME:
+ return QUALIFIED_CLASS_NAME_EDEFAULT == null ? qualifiedClassName != null : !QUALIFIED_CLASS_NAME_EDEFAULT.equals(qualifiedClassName);
+ case GMFGraphPackage.GRID_LAYOUT__BUNDLE_NAME:
+ return BUNDLE_NAME_EDEFAULT == null ? bundleName != null : !BUNDLE_NAME_EDEFAULT.equals(bundleName);
+ case GMFGraphPackage.GRID_LAYOUT__NUM_COLUMNS:
+ return numColumns != NUM_COLUMNS_EDEFAULT;
+ case GMFGraphPackage.GRID_LAYOUT__EQUAL_WIDTH:
+ return equalWidth != EQUAL_WIDTH_EDEFAULT;
+ case GMFGraphPackage.GRID_LAYOUT__MARGINS:
+ return margins != null;
+ case GMFGraphPackage.GRID_LAYOUT__SPACING:
+ return spacing != null;
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (qualifiedClassName: ");
+ result.append(qualifiedClassName);
+ result.append(", bundleName: ");
+ result.append(bundleName);
+ result.append(", numColumns: ");
+ result.append(numColumns);
+ result.append(", equalWidth: ");
+ result.append(equalWidth);
+ result.append(')');
+ return result.toString();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String getQualifiedClassNameGen() {
+ return qualifiedClassName;
+ }
+
+ /**
+ * @generated NOT
+ */
+ public String getQualifiedClassName() {
+ return "org.eclipse.gmf.internal.codegen.draw2d.GridLayout";
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setQualifiedClassNameGen(String newQualifiedClassName) {
+ String oldQualifiedClassName = qualifiedClassName;
+ qualifiedClassName = newQualifiedClassName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT__QUALIFIED_CLASS_NAME, oldQualifiedClassName, qualifiedClassName));
+ }
+
+ /**
+ * @generated NOT
+ */
+ public void setQualifiedClassName(String newQualifiedClassName) {
+ //throw new UnsupportedOperationException("You can not change predefined name of implementation class");
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String getBundleName() {
+ return bundleName;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setBundleName(String newBundleName) {
+ String oldBundleName = bundleName;
+ bundleName = newBundleName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT__BUNDLE_NAME, oldBundleName, bundleName));
+ }
+
+} //GridLayoutImpl
Index: src/org/eclipse/gmf/gmfgraph/impl/LayoutImpl.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/impl/LayoutImpl.java
diff -N src/org/eclipse/gmf/gmfgraph/impl/LayoutImpl.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/impl/LayoutImpl.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,220 @@
+/**
+ *
+ *
+ *
+ * $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.gmf.gmfgraph.Dimension;
+import org.eclipse.gmf.gmfgraph.GMFGraphPackage;
+import org.eclipse.gmf.gmfgraph.Layout;
+
+import org.eclipse.gmf.gmfgraph.LayoutData;
+
+/**
+ *
+ * An implementation of the model object 'Layout
+ * The following features are implemented:
+ *
+ * {@link org.eclipse.gmf.gmfgraph.impl.LayoutImpl#getQualifiedClassName Qualified Class Name }
+ * {@link org.eclipse.gmf.gmfgraph.impl.LayoutImpl#getBundleName Bundle Name }
+ *
+ *
+ *
+ * @generated
+ */
+public class LayoutImpl extends EObjectImpl implements Layout {
+ /**
+ * The default value of the '{@link #getQualifiedClassName() Qualified Class Name }' attribute.
+ *
+ *
+ * @see #getQualifiedClassName()
+ * @generated
+ * @ordered
+ */
+ protected static final String QUALIFIED_CLASS_NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getQualifiedClassName() Qualified Class Name }' attribute.
+ *
+ *
+ * @see #getQualifiedClassName()
+ * @generated
+ * @ordered
+ */
+ protected String qualifiedClassName = QUALIFIED_CLASS_NAME_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getBundleName() Bundle Name }' attribute.
+ *
+ *
+ * @see #getBundleName()
+ * @generated
+ * @ordered
+ */
+ protected static final String BUNDLE_NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getBundleName() Bundle Name }' attribute.
+ *
+ *
+ * @see #getBundleName()
+ * @generated
+ * @ordered
+ */
+ protected String bundleName = BUNDLE_NAME_EDEFAULT;
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected LayoutImpl() {
+ super();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected EClass eStaticClass() {
+ return GMFGraphPackage.eINSTANCE.getLayout();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String getQualifiedClassName() {
+ return qualifiedClassName;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setQualifiedClassName(String newQualifiedClassName) {
+ String oldQualifiedClassName = qualifiedClassName;
+ qualifiedClassName = newQualifiedClassName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.LAYOUT__QUALIFIED_CLASS_NAME, oldQualifiedClassName, qualifiedClassName));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String getBundleName() {
+ return bundleName;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setBundleName(String newBundleName) {
+ String oldBundleName = bundleName;
+ bundleName = newBundleName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.LAYOUT__BUNDLE_NAME, oldBundleName, bundleName));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case GMFGraphPackage.LAYOUT__QUALIFIED_CLASS_NAME:
+ return getQualifiedClassName();
+ case GMFGraphPackage.LAYOUT__BUNDLE_NAME:
+ return getBundleName();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case GMFGraphPackage.LAYOUT__QUALIFIED_CLASS_NAME:
+ setQualifiedClassName((String)newValue);
+ return;
+ case GMFGraphPackage.LAYOUT__BUNDLE_NAME:
+ setBundleName((String)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case GMFGraphPackage.LAYOUT__QUALIFIED_CLASS_NAME:
+ setQualifiedClassName(QUALIFIED_CLASS_NAME_EDEFAULT);
+ return;
+ case GMFGraphPackage.LAYOUT__BUNDLE_NAME:
+ setBundleName(BUNDLE_NAME_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case GMFGraphPackage.LAYOUT__QUALIFIED_CLASS_NAME:
+ return QUALIFIED_CLASS_NAME_EDEFAULT == null ? qualifiedClassName != null : !QUALIFIED_CLASS_NAME_EDEFAULT.equals(qualifiedClassName);
+ case GMFGraphPackage.LAYOUT__BUNDLE_NAME:
+ return BUNDLE_NAME_EDEFAULT == null ? bundleName != null : !BUNDLE_NAME_EDEFAULT.equals(bundleName);
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (qualifiedClassName: ");
+ result.append(qualifiedClassName);
+ result.append(", bundleName: ");
+ result.append(bundleName);
+ result.append(')');
+ return result.toString();
+ }
+
+} //LayoutImpl
Index: src/org/eclipse/gmf/gmfgraph/impl/CustomLayoutImpl.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/impl/CustomLayoutImpl.java
diff -N src/org/eclipse/gmf/gmfgraph/impl/CustomLayoutImpl.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/impl/CustomLayoutImpl.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,303 @@
+/**
+ *
+ *
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+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.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.gmf.gmfgraph.CustomAttribute;
+import org.eclipse.gmf.gmfgraph.CustomConfigurableClass;
+import org.eclipse.gmf.gmfgraph.CustomLayout;
+import org.eclipse.gmf.gmfgraph.GMFGraphPackage;
+
+/**
+ *
+ * An implementation of the model object 'Custom Layout
+ * The following features are implemented:
+ *
+ * {@link org.eclipse.gmf.gmfgraph.impl.CustomLayoutImpl#getQualifiedClassName Qualified Class Name }
+ * {@link org.eclipse.gmf.gmfgraph.impl.CustomLayoutImpl#getBundleName Bundle Name }
+ * {@link org.eclipse.gmf.gmfgraph.impl.CustomLayoutImpl#getAttributes Attributes }
+ *
+ *
+ *
+ * @generated
+ */
+public class CustomLayoutImpl extends EObjectImpl implements CustomLayout {
+ /**
+ * The default value of the '{@link #getQualifiedClassName() Qualified Class Name }' attribute.
+ *
+ *
+ * @see #getQualifiedClassName()
+ * @generated
+ * @ordered
+ */
+ protected static final String QUALIFIED_CLASS_NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getQualifiedClassName() Qualified Class Name }' attribute.
+ *
+ *
+ * @see #getQualifiedClassName()
+ * @generated
+ * @ordered
+ */
+ protected String qualifiedClassName = QUALIFIED_CLASS_NAME_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getBundleName() Bundle Name }' attribute.
+ *
+ *
+ * @see #getBundleName()
+ * @generated
+ * @ordered
+ */
+ protected static final String BUNDLE_NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getBundleName() Bundle Name }' attribute.
+ *
+ *
+ * @see #getBundleName()
+ * @generated
+ * @ordered
+ */
+ protected String bundleName = BUNDLE_NAME_EDEFAULT;
+
+ /**
+ * The cached value of the '{@link #getAttributes() Attributes }' containment reference list.
+ *
+ *
+ * @see #getAttributes()
+ * @generated
+ * @ordered
+ */
+ protected EList attributes = null;
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected CustomLayoutImpl() {
+ super();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected EClass eStaticClass() {
+ return GMFGraphPackage.eINSTANCE.getCustomLayout();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String getQualifiedClassName() {
+ return qualifiedClassName;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setQualifiedClassName(String newQualifiedClassName) {
+ String oldQualifiedClassName = qualifiedClassName;
+ qualifiedClassName = newQualifiedClassName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CUSTOM_LAYOUT__QUALIFIED_CLASS_NAME, oldQualifiedClassName, qualifiedClassName));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String getBundleName() {
+ return bundleName;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setBundleName(String newBundleName) {
+ String oldBundleName = bundleName;
+ bundleName = newBundleName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CUSTOM_LAYOUT__BUNDLE_NAME, oldBundleName, bundleName));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public EList getAttributes() {
+ if (attributes == null) {
+ attributes = new EObjectContainmentEList(CustomAttribute.class, this, GMFGraphPackage.CUSTOM_LAYOUT__ATTRIBUTES);
+ }
+ return attributes;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case GMFGraphPackage.CUSTOM_LAYOUT__ATTRIBUTES:
+ return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case GMFGraphPackage.CUSTOM_LAYOUT__QUALIFIED_CLASS_NAME:
+ return getQualifiedClassName();
+ case GMFGraphPackage.CUSTOM_LAYOUT__BUNDLE_NAME:
+ return getBundleName();
+ case GMFGraphPackage.CUSTOM_LAYOUT__ATTRIBUTES:
+ return getAttributes();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case GMFGraphPackage.CUSTOM_LAYOUT__QUALIFIED_CLASS_NAME:
+ setQualifiedClassName((String)newValue);
+ return;
+ case GMFGraphPackage.CUSTOM_LAYOUT__BUNDLE_NAME:
+ setBundleName((String)newValue);
+ return;
+ case GMFGraphPackage.CUSTOM_LAYOUT__ATTRIBUTES:
+ getAttributes().clear();
+ getAttributes().addAll((Collection)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case GMFGraphPackage.CUSTOM_LAYOUT__QUALIFIED_CLASS_NAME:
+ setQualifiedClassName(QUALIFIED_CLASS_NAME_EDEFAULT);
+ return;
+ case GMFGraphPackage.CUSTOM_LAYOUT__BUNDLE_NAME:
+ setBundleName(BUNDLE_NAME_EDEFAULT);
+ return;
+ case GMFGraphPackage.CUSTOM_LAYOUT__ATTRIBUTES:
+ getAttributes().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case GMFGraphPackage.CUSTOM_LAYOUT__QUALIFIED_CLASS_NAME:
+ return QUALIFIED_CLASS_NAME_EDEFAULT == null ? qualifiedClassName != null : !QUALIFIED_CLASS_NAME_EDEFAULT.equals(qualifiedClassName);
+ case GMFGraphPackage.CUSTOM_LAYOUT__BUNDLE_NAME:
+ return BUNDLE_NAME_EDEFAULT == null ? bundleName != null : !BUNDLE_NAME_EDEFAULT.equals(bundleName);
+ case GMFGraphPackage.CUSTOM_LAYOUT__ATTRIBUTES:
+ return attributes != null && !attributes.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
+ if (baseClass == CustomConfigurableClass.class) {
+ switch (derivedFeatureID) {
+ case GMFGraphPackage.CUSTOM_LAYOUT__ATTRIBUTES: return GMFGraphPackage.CUSTOM_CONFIGURABLE_CLASS__ATTRIBUTES;
+ default: return -1;
+ }
+ }
+ return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
+ if (baseClass == CustomConfigurableClass.class) {
+ switch (baseFeatureID) {
+ case GMFGraphPackage.CUSTOM_CONFIGURABLE_CLASS__ATTRIBUTES: return GMFGraphPackage.CUSTOM_LAYOUT__ATTRIBUTES;
+ default: return -1;
+ }
+ }
+ return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (qualifiedClassName: ");
+ result.append(qualifiedClassName);
+ result.append(", bundleName: ");
+ result.append(bundleName);
+ result.append(')');
+ return result.toString();
+ }
+
+} //CustomLayoutImpl
Index: src/org/eclipse/gmf/gmfgraph/CustomLayout.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/CustomLayout.java
diff -N src/org/eclipse/gmf/gmfgraph/CustomLayout.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/CustomLayout.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,21 @@
+/**
+ *
+ *
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph;
+
+
+/**
+ *
+ * A representation of the model object 'Custom Layout
+ *
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph;
+
+
+/**
+ *
+ * A representation of the model object 'Custom Layout Data
+ *
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph;
+
+
+/**
+ *
+ * A representation of the model object 'Border Layout Data
+ * The following features are supported:
+ *
+ * {@link org.eclipse.gmf.gmfgraph.BorderLayoutData#getAlignment Alignment }
+ * {@link org.eclipse.gmf.gmfgraph.BorderLayoutData#isVertical Vertical }
+ *
+ *
+ *
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getBorderLayoutData()
+ * @model
+ * @generated
+ */
+public interface BorderLayoutData extends LayoutData {
+ /**
+ * Returns the value of the 'Alignment "CENTER".
+ * The literals are from the enumeration {@link org.eclipse.gmf.gmfgraph.Alignment}.
+ *
+ *
+ * If the meaning of the 'Alignment ' attribute isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Alignment ' attribute.
+ * @see org.eclipse.gmf.gmfgraph.Alignment
+ * @see #setAlignment(Alignment)
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getBorderLayoutData_Alignment()
+ * @model default="CENTER" required="true"
+ * @generated
+ */
+ Alignment getAlignment();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.BorderLayoutData#getAlignment Alignment }' attribute.
+ *
+ *
+ * @param value the new value of the 'Alignment ' attribute.
+ * @see org.eclipse.gmf.gmfgraph.Alignment
+ * @see #getAlignment()
+ * @generated
+ */
+ void setAlignment(Alignment value);
+
+ /**
+ * Returns the value of the 'Vertical "false".
+ *
+ *
+ * If the meaning of the 'Vertical ' attribute isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Vertical ' attribute.
+ * @see #setVertical(boolean)
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getBorderLayoutData_Vertical()
+ * @model default="false"
+ * @generated
+ */
+ boolean isVertical();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.BorderLayoutData#isVertical Vertical }' attribute.
+ *
+ *
+ * @param value the new value of the 'Vertical ' attribute.
+ * @see #isVertical()
+ * @generated
+ */
+ void setVertical(boolean value);
+
+} // BorderLayoutData
Index: src/org/eclipse/gmf/gmfgraph/LayoutData.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/LayoutData.java
diff -N src/org/eclipse/gmf/gmfgraph/LayoutData.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/LayoutData.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,56 @@
+/**
+ *
+ *
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ *
+ * A representation of the model object 'Layout Data
+ * The following features are supported:
+ *
+ * {@link org.eclipse.gmf.gmfgraph.LayoutData#getOwner Owner }
+ *
+ *
+ *
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getLayoutData()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+public interface LayoutData extends CustomClass {
+ /**
+ * Returns the value of the 'Owner Data }'.
+ *
+ *
+ * If the meaning of the 'Owner ' container reference isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Owner ' container reference.
+ * @see #setOwner(Layoutable)
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getLayoutData_Owner()
+ * @see org.eclipse.gmf.gmfgraph.Layoutable#getData
+ * @model opposite="data" required="true"
+ * @generated
+ */
+ Layoutable getOwner();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.gmf.gmfgraph.LayoutData#getOwner Owner }' container reference.
+ *
+ *
+ * @param value the new value of the 'Owner ' container reference.
+ * @see #getOwner()
+ * @generated
+ */
+ void setOwner(Layoutable value);
+
+} // LayoutData
Index: src/org/eclipse/gmf/gmfgraph/CustomConfigurableClass.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/CustomConfigurableClass.java
diff -N src/org/eclipse/gmf/gmfgraph/CustomConfigurableClass.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/CustomConfigurableClass.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,44 @@
+/**
+ *
+ *
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ *
+ * A representation of the model object 'Custom Configurable Class
+ * The following features are supported:
+ *
+ * {@link org.eclipse.gmf.gmfgraph.CustomConfigurableClass#getAttributes Attributes }
+ *
+ *
+ *
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getCustomConfigurableClass()
+ * @model
+ * @generated
+ */
+public interface CustomConfigurableClass extends CustomClass {
+ /**
+ * Returns the value of the 'Attributes
+ * If the meaning of the 'Attributes ' containment reference list isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Attributes ' containment reference list.
+ * @see org.eclipse.gmf.gmfgraph.GMFGraphPackage#getCustomConfigurableClass_Attributes()
+ * @model type="org.eclipse.gmf.gmfgraph.CustomAttribute" containment="true"
+ * @generated
+ */
+ EList getAttributes();
+
+} // CustomConfigurableClass
Index: src/org/eclipse/gmf/gmfgraph/Layout.java
===================================================================
RCS file: src/org/eclipse/gmf/gmfgraph/Layout.java
diff -N src/org/eclipse/gmf/gmfgraph/Layout.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/gmfgraph/Layout.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,22 @@
+/**
+ *
+ *
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.gmfgraph;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ *
+ * A representation of the model object 'Layout generated tag and modify it." + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected NodeFigure createNodeFigure() {" + NL + "\t\tNodeFigure figure = createNodePlate();" + NL + "\t\tfigure.setLayoutManager(new StackLayout());" + NL + "\t\tIFigure shape = createNodeShape();" + NL + "\t\tfigure.add(shape);" + NL + "\t\tshape.setLayoutManager(new StackLayout());" + NL + "\t\t" + NL + "\t\tIFigure shapeContents = new Figure();" + NL + "\t\tshape.add(shapeContents);" + NL + "\t\tshapeContents.setLayoutManager(new BorderLayout());" + NL + "\t\taddContentPane(shapeContents);" + NL + "\t\tdecorateShape(shapeContents);" + NL + "" + NL + "\t\treturn figure;" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void decorateShape(IFigure shapeContents) {" + NL + "\t\tView view = (View) getModel();" + NL + "\t\tEAnnotation annotation = view.getEAnnotation(\"Shortcutted\"); //$NON-NLS-1$" + NL + "\t\tif (annotation == null) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t" + NL + "\t\tFigure decorationPane = new Figure();" + NL + "\t\tdecorationPane.setLayoutManager(new BorderLayout());" + NL + "\t\tshapeContents.add(decorationPane, BorderLayout.BOTTOM);" + NL + "\t\t" + NL + "\t\tImageFigureEx imageFigure = new ImageFigureEx(";
+ protected final String TEXT_47 = "));" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * Creates figure for this edit part." + NL + "\t * " + NL + "\t * Body of this method does not depend on settings in generation model" + NL + "\t * so you may safely remove generated tag and modify it." + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected NodeFigure createNodeFigure() {" + NL + "\t\tNodeFigure figure = createNodePlate();" + NL + "\t\tfigure.setLayoutManager(new StackLayout());" + NL + "\t\tIFigure shape = createNodeShape();" + NL + "\t\tfigure.add(shape);" + NL + "\t\tif (shape.getLayoutManager() == null){" + NL + "\t\t\tshape.setLayoutManager(new StackLayout());" + NL + "\t\t}" + NL + "\t\t" + NL + "\t\tIFigure shapeContents = new Figure();" + NL + "\t\tshape.add(shapeContents);" + NL + "\t\tshapeContents.setLayoutManager(new BorderLayout());" + NL + "\t\taddContentPane(shapeContents);" + NL + "\t\tdecorateShape(shapeContents);" + NL + "" + NL + "\t\treturn figure;" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void decorateShape(IFigure shapeContents) {" + NL + "\t\tView view = (View) getModel();" + NL + "\t\tEAnnotation annotation = view.getEAnnotation(\"Shortcutted\"); //$NON-NLS-1$" + NL + "\t\tif (annotation == null) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t" + NL + "\t\tFigure decorationPane = new Figure();" + NL + "\t\tdecorationPane.setLayoutManager(new BorderLayout());" + NL + "\t\tshapeContents.add(decorationPane, BorderLayout.BOTTOM);" + NL + "\t\t" + NL + "\t\tImageFigureEx imageFigure = new ImageFigureEx(";
protected final String TEXT_48 = ".getInstance().getBundledImage(\"icons/shortcut.gif\"));" + NL + "\t\tdecorationPane.add(imageFigure, BorderLayout.RIGHT);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void addContentPane(IFigure shape) {" + NL + "\t\tcontentPane = new ";
protected final String TEXT_49 = "();" + NL + "\t\tshape.add(contentPane, BorderLayout.CENTER);";
protected final String TEXT_50 = NL + "\t\t";
Index: templates/parts/NodeEditPart.javajet
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/templates/parts/NodeEditPart.javajet,v
retrieving revision 1.38
diff -u -r1.38 NodeEditPart.javajet
--- templates/parts/NodeEditPart.javajet 8 Feb 2006 17:15:50 -0000 1.38
+++ templates/parts/NodeEditPart.javajet 9 Feb 2006 18:41:50 -0000
@@ -163,7 +163,9 @@
figure.setLayoutManager(new StackLayout());
IFigure shape = createNodeShape();
figure.add(shape);
- shape.setLayoutManager(new StackLayout());
+ if (shape.getLayoutManager() == null){
+ shape.setLayoutManager(new StackLayout());
+ }
IFigure shapeContents = new Figure();
shape.add(shapeContents);
#P org.eclipse.gmf.graphdef.codegen
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.2
diff -u -r1.2 NewFigureGenerator.java
--- src/org/eclipse/gmf/graphdef/codegen/templates/NewFigureGenerator.java 6 Feb 2006 22:21:42 -0000 1.2
+++ src/org/eclipse/gmf/graphdef/codegen/templates/NewFigureGenerator.java 9 Feb 2006 18:41:51 -0000
@@ -1,7 +1,7 @@
package org.eclipse.gmf.graphdef.codegen.templates;
import org.eclipse.gmf.gmfgraph.*;
-import org.eclipse.gmf.graphdef.codegen.GraphDefDispatcher;
+import org.eclipse.gmf.graphdef.codegen.*;
public class NewFigureGenerator
{
@@ -20,6 +20,8 @@
protected final String TEXT_3 = " = new ";
protected final String TEXT_4 = "();";
protected final String TEXT_5 = NL;
+ protected final String TEXT_6 = NL;
+ protected final String TEXT_7 = NL;
public String generate(Object argument)
{
@@ -42,6 +44,9 @@
stringBuffer.append(TEXT_4);
stringBuffer.append(TEXT_5);
stringBuffer.append(args.getDispatcher().dispatch(figureInstance, args));
+ stringBuffer.append(TEXT_6);
+ stringBuffer.append(args.getDispatcher().dispatch("createLayout", new LayoutGeneratorArguments(args)));
+ stringBuffer.append(TEXT_7);
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.2
diff -u -r1.2 TopShapeGenerator.java
--- src/org/eclipse/gmf/graphdef/codegen/templates/TopShapeGenerator.java 6 Feb 2006 22:21:42 -0000 1.2
+++ src/org/eclipse/gmf/graphdef/codegen/templates/TopShapeGenerator.java 9 Feb 2006 18:41:51 -0000
@@ -3,7 +3,7 @@
import org.eclipse.gmf.gmfgraph.*;
import org.eclipse.gmf.gmfgraph.util.*;
import org.eclipse.gmf.common.codegen.*;
-import org.eclipse.gmf.graphdef.codegen.GraphDefDispatcher;
+import org.eclipse.gmf.graphdef.codegen.*;
import java.util.*;
public class TopShapeGenerator
@@ -22,24 +22,29 @@
protected final String TEXT_2 = NL + NL + "/**" + NL + " * @generated" + NL + " */" + NL + "public class ";
protected final String TEXT_3 = " extends ";
protected final String TEXT_4 = " {" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
- protected final String TEXT_5 = "() {" + NL + "\t\t";
- protected final String TEXT_6 = NL + "\t\tsetFigure";
- protected final String TEXT_7 = "(createFigure";
- protected final String TEXT_8 = "());" + NL + "\t\tadd(getFigure";
- protected final String TEXT_9 = "());";
- protected final String TEXT_10 = NL + "\t}" + NL;
- protected final String TEXT_11 = NL + NL + "\tprivate IFigure f";
- protected final String TEXT_12 = "; " + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic IFigure getFigure";
- protected final String TEXT_13 = "() {" + NL + "\t\treturn f";
- protected final String TEXT_14 = ";" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setFigure";
- protected final String TEXT_15 = "(IFigure figure) {" + NL + "\t\tf";
- protected final String TEXT_16 = " = figure;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate IFigure createFigure";
- protected final String TEXT_17 = "() {";
- protected final String TEXT_18 = NL;
- protected final String TEXT_19 = NL;
- protected final String TEXT_20 = NL + "\t\treturn rv;" + NL + "\t}" + NL;
- protected final String TEXT_21 = NL + "}";
- protected final String TEXT_22 = NL;
+ protected final String TEXT_5 = "() {";
+ protected final String TEXT_6 = "\t" + NL + "\t\t";
+ protected final String TEXT_7 = NL + "\t\t";
+ protected final String TEXT_8 = NL + "\t\t" + NL + "\t\torg.eclipse.draw2d.IFigure child";
+ protected final String TEXT_9 = " = createFigure";
+ protected final String TEXT_10 = "();" + NL + "\t\tsetFigure";
+ protected final String TEXT_11 = "(child";
+ protected final String TEXT_12 = ");" + NL + "\t\tadd(child";
+ protected final String TEXT_13 = ");" + NL + "" + NL + "\t\t";
+ protected final String TEXT_14 = "\t\t" + NL;
+ protected final String TEXT_15 = NL + "\t}" + NL;
+ protected final String TEXT_16 = NL + NL + "\tprivate IFigure f";
+ protected final String TEXT_17 = "; " + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic IFigure getFigure";
+ protected final String TEXT_18 = "() {" + NL + "\t\treturn f";
+ protected final String TEXT_19 = ";" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setFigure";
+ protected final String TEXT_20 = "(IFigure figure) {" + NL + "\t\tf";
+ protected final String TEXT_21 = " = figure;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate IFigure createFigure";
+ protected final String TEXT_22 = "() {";
+ protected final String TEXT_23 = NL;
+ protected final String TEXT_24 = NL;
+ protected final String TEXT_25 = NL + "\t\treturn rv;" + NL + "\t}" + NL;
+ protected final String TEXT_26 = NL + "}";
+ protected final String TEXT_27 = NL;
public String generate(Object argument)
{
@@ -60,45 +65,59 @@
stringBuffer.append(TEXT_4);
stringBuffer.append(figure.getName());
stringBuffer.append(TEXT_5);
- stringBuffer.append(dispatcher.dispatch(figure, dispatcher.create(figure, "this")));
-for (Iterator it = figure.getResolvedChildren().iterator(); it.hasNext();) {
- Figure next = (Figure) it.next();
+LayoutGeneratorArguments dispatcherArgs = new LayoutGeneratorArguments(dispatcher.create(figure, "this"), "myGenLayoutManager");
+
stringBuffer.append(TEXT_6);
- stringBuffer.append(next.getName());
+ stringBuffer.append(dispatcher.dispatch("createLayout", dispatcherArgs));
stringBuffer.append(TEXT_7);
- stringBuffer.append(next.getName());
+ stringBuffer.append(dispatcher.dispatch(figure, dispatcherArgs));
+
+for (Iterator it = figure.getResolvedChildren().iterator(); it.hasNext();) {
+ Figure next = (Figure) it.next();
stringBuffer.append(TEXT_8);
stringBuffer.append(next.getName());
stringBuffer.append(TEXT_9);
- }
+ stringBuffer.append(next.getName());
stringBuffer.append(TEXT_10);
-
-int fc = 0;
-for (Iterator it = figure.getResolvedChildren().iterator(); it.hasNext(); fc++) {
- Figure next = (Figure) it.next();
+ stringBuffer.append(next.getName());
stringBuffer.append(TEXT_11);
stringBuffer.append(next.getName());
stringBuffer.append(TEXT_12);
stringBuffer.append(next.getName());
stringBuffer.append(TEXT_13);
- stringBuffer.append(next.getName());
+ stringBuffer.append(dispatcher.dispatch("createLayoutData",
+ new LayoutGeneratorArguments(dispatcher.create(next, "child" + next.getName()), "layout" + next.getName())
+ ));
stringBuffer.append(TEXT_14);
- stringBuffer.append(next.getName());
+ }
stringBuffer.append(TEXT_15);
- stringBuffer.append(next.getName());
+
+int fc = 0;
+for (Iterator it = figure.getResolvedChildren().iterator(); it.hasNext(); fc++) {
+ Figure next = (Figure) it.next();
stringBuffer.append(TEXT_16);
stringBuffer.append(next.getName());
stringBuffer.append(TEXT_17);
+ stringBuffer.append(next.getName());
stringBuffer.append(TEXT_18);
- stringBuffer.append(dispatcher.dispatch("instantiate", dispatcher.create(next, "rv")));
+ stringBuffer.append(next.getName());
stringBuffer.append(TEXT_19);
- stringBuffer.append(dispatcher.dispatch("Children", new Object[] {next.getChildren(), dispatcher, "rv"}));
+ stringBuffer.append(next.getName());
stringBuffer.append(TEXT_20);
- }
+ stringBuffer.append(next.getName());
stringBuffer.append(TEXT_21);
- importManager.emitSortedImports();
+ stringBuffer.append(next.getName());
stringBuffer.append(TEXT_22);
+ stringBuffer.append(TEXT_23);
+ stringBuffer.append(dispatcher.dispatch("instantiate", dispatcher.create(next, "rv")));
+ stringBuffer.append(TEXT_24);
+ stringBuffer.append(dispatcher.dispatch("Children", new Object[] {next.getChildren(), dispatcher, "rv"}));
+ stringBuffer.append(TEXT_25);
+ }
+ stringBuffer.append(TEXT_26);
+ importManager.emitSortedImports();
+ stringBuffer.append(TEXT_27);
return stringBuffer.toString();
}
}
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.2
diff -u -r1.2 FigureChildrenGenerator.java
--- src/org/eclipse/gmf/graphdef/codegen/templates/FigureChildrenGenerator.java 6 Feb 2006 22:21:42 -0000 1.2
+++ src/org/eclipse/gmf/graphdef/codegen/templates/FigureChildrenGenerator.java 9 Feb 2006 18:41:51 -0000
@@ -1,7 +1,7 @@
package org.eclipse.gmf.graphdef.codegen.templates;
import org.eclipse.gmf.gmfgraph.*;
-import org.eclipse.gmf.graphdef.codegen.GraphDefDispatcher;
+import org.eclipse.gmf.graphdef.codegen.*;
import java.util.*;
public class FigureChildrenGenerator
@@ -20,7 +20,7 @@
protected final String TEXT_2 = NL + "\t\t// FIXME instantiate - FigureRef - dispatch to 'instantiate' template?" + NL + "\t\t";
protected final String TEXT_3 = NL + "\t\t";
protected final String TEXT_4 = ".add(";
- protected final String TEXT_5 = ");";
+ protected final String TEXT_5 = ");" + NL + "\t\t";
protected final String TEXT_6 = NL;
public String generate(Object argument)
@@ -49,7 +49,9 @@
if (figureMarker instanceof FigureRef) {
throw new IllegalStateException("FIXME: sorry, don't support FigureRef for a while");
}
- final String figureVarName = "fig" + (figureCount++);
+ final String figureVarName = "fig" + figureCount;
+ final String layoutDataVarName = "layData" + figureCount;
+ figureCount++;
stringBuffer.append(TEXT_2);
stringBuffer.append(dispatcher.dispatch("instantiate", dispatcher.create((Figure) figureMarker, figureVarName)));
stringBuffer.append(TEXT_3);
@@ -57,6 +59,8 @@
stringBuffer.append(TEXT_4);
stringBuffer.append(figureVarName);
stringBuffer.append(TEXT_5);
+ stringBuffer.append(dispatcher.dispatch("createLayoutData",
+ new LayoutGeneratorArguments(dispatcher, (Figure)figureMarker, figureVarName, layoutDataVarName)));
if (_nxt instanceof Figure && !((Figure) _nxt).getChildren().isEmpty()) {
l.addFirst(marker);
Index: META-INF/MANIFEST.MF
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/META-INF/MANIFEST.MF,v
retrieving revision 1.5
diff -u -r1.5 MANIFEST.MF
--- META-INF/MANIFEST.MF 6 Feb 2006 22:21:42 -0000 1.5
+++ META-INF/MANIFEST.MF 9 Feb 2006 18:41:51 -0000
@@ -1,13 +1,15 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
+Bundle-Name: Graphical Definition Code Generator
Bundle-SymbolicName: org.eclipse.gmf.graphdef.codegen;singleton:=true
Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: %providerName
+Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.gmf.graphdef;visibility:=reexport,
- org.eclipse.gmf.common,
org.eclipse.emf.ecore,
- org.eclipse.emf.codegen
+ org.eclipse.gmf.common,
+ org.eclipse.gmf.graphdef;visibility:=reexport,
+ org.eclipse.emf.codegen,
+ org.eclipse.draw2d
+
Export-Package: org.eclipse.gmf.graphdef.codegen
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.2
diff -u -r1.2 Shape.javajet
--- templates/top/Shape.javajet 6 Feb 2006 22:21:42 -0000 1.2
+++ templates/top/Shape.javajet 9 Feb 2006 18:41:51 -0000
@@ -1,5 +1,5 @@
<%@ jet package="org.eclipse.gmf.graphdef.codegen.templates" class="TopShapeGenerator"
- imports="org.eclipse.gmf.gmfgraph.* org.eclipse.gmf.gmfgraph.util.* org.eclipse.gmf.common.codegen.* org.eclipse.gmf.graphdef.codegen.GraphDefDispatcher java.util.*"%>
+ imports="org.eclipse.gmf.gmfgraph.* org.eclipse.gmf.gmfgraph.util.* org.eclipse.gmf.common.codegen.* org.eclipse.gmf.graphdef.codegen.* java.util.*"%>
<%
Object[] args = (Object[]) argument;
Shape figure = (Shape) args[0];
@@ -18,12 +18,23 @@
* @generated
*/
public <%=figure.getName()%>() {
- <%=dispatcher.dispatch(figure, dispatcher.create(figure, "this"))%>
+<%
+LayoutGeneratorArguments dispatcherArgs = new LayoutGeneratorArguments(dispatcher.create(figure, "this"), "myGenLayoutManager");
+%>
+ <%=dispatcher.dispatch("createLayout", dispatcherArgs)%>
+ <%=dispatcher.dispatch(figure, dispatcherArgs)%>
<%
for (Iterator it = figure.getResolvedChildren().iterator(); it.hasNext();) {
Figure next = (Figure) it.next();%>
- setFigure<%=next.getName()%>(createFigure<%=next.getName()%>());
- add(getFigure<%=next.getName()%>());
+
+ org.eclipse.draw2d.IFigure child<%=next.getName()%> = createFigure<%=next.getName()%>();
+ setFigure<%=next.getName()%>(child<%=next.getName()%>);
+ add(child<%=next.getName()%>);
+
+ <%=dispatcher.dispatch("createLayoutData",
+ new LayoutGeneratorArguments(dispatcher.create(next, "child" + next.getName()), "layout" + next.getName())
+ )%>
+
<%}%>
}
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.7
diff -u -r1.7 FigureGenerator.java
--- src/org/eclipse/gmf/graphdef/codegen/FigureGenerator.java 6 Feb 2006 22:32:28 -0000 1.7
+++ src/org/eclipse/gmf/graphdef/codegen/FigureGenerator.java 9 Feb 2006 18:41:51 -0000
@@ -15,7 +15,14 @@
import org.eclipse.emf.codegen.jet.JETException;
import org.eclipse.gmf.common.codegen.ImportAssistant;
import org.eclipse.gmf.common.codegen.NullImportAssistant;
+import org.eclipse.gmf.gmfgraph.BorderLayout;
+import org.eclipse.gmf.gmfgraph.BorderLayoutData;
+import org.eclipse.gmf.gmfgraph.CustomConfigurableClass;
+import org.eclipse.gmf.gmfgraph.CustomLayout;
+import org.eclipse.gmf.gmfgraph.CustomLayoutData;
import org.eclipse.gmf.gmfgraph.Figure;
+import org.eclipse.gmf.gmfgraph.GridLayout;
+import org.eclipse.gmf.gmfgraph.GridLayoutData;
import org.eclipse.gmf.gmfgraph.Label;
import org.eclipse.gmf.gmfgraph.PolygonDecoration;
import org.eclipse.gmf.gmfgraph.Polyline;
@@ -25,10 +32,19 @@
import org.eclipse.gmf.gmfgraph.Shape;
import org.eclipse.gmf.gmfgraph.util.FigureQualifiedNameSwitch;
import org.eclipse.gmf.gmfgraph.util.GMFGraphSwitch;
+import org.eclipse.gmf.graphdef.codegen.templates.CustomClassAttributesGenerator;
import org.eclipse.gmf.graphdef.codegen.templates.FigureAttrGenerator;
import org.eclipse.gmf.graphdef.codegen.templates.FigureChildrenGenerator;
+import org.eclipse.gmf.graphdef.codegen.templates.InitBorderLayoutDataGenerator;
+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.InitGridLayoutDataGenerator;
+import org.eclipse.gmf.graphdef.codegen.templates.InitGridLayoutGenerator;
import org.eclipse.gmf.graphdef.codegen.templates.LabelAttrGenerator;
import org.eclipse.gmf.graphdef.codegen.templates.NewFigureGenerator;
+import org.eclipse.gmf.graphdef.codegen.templates.NewLayoutDataGenerator;
+import org.eclipse.gmf.graphdef.codegen.templates.NewLayoutGenerator;
import org.eclipse.gmf.graphdef.codegen.templates.PolygonDecorationAttrGenerator;
import org.eclipse.gmf.graphdef.codegen.templates.PolylineAttrGenerator;
import org.eclipse.gmf.graphdef.codegen.templates.PolylineDecorationAttrGenerator;
@@ -101,7 +117,7 @@
tr.put(Figure.class, "/templates/top/Figure.javajet", TopFigureGenerator.class);
return tr;
}
-
+
// XXX NOTE, the fact we use "instantiate" and "Children" strings
// helps us to postpone resolution of the next problem (one we make these twwo overridable):
// it's not possible to tell from single dispatcher.dispatch(Figure, args) what's the intention -
@@ -124,6 +140,19 @@
tr.put("Shape", "/templates/attr/Shape.javajet", ShapeAttrGenerator.class);
tr.put("Figure", "/templates/attr/Figure.javajet", FigureAttrGenerator.class);
tr.put("PolylineDecoration", "/templates/attr/PolylineDecoration.javajet", PolylineDecorationAttrGenerator.class);
+
+ // Custom attributes support
+ tr.put("customAttributes", "/templates/attr/CustomConfigurableClass.javajet", CustomClassAttributesGenerator.class);
+ // Layout related dispatching chain.
+ tr.put("createLayout", "/templates/layout/FigureMarker.javajet", NewLayoutGenerator.class);
+ 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("createLayoutData", "/templates/layoutData/FigureMarker.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);
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.1
diff -u -r1.1 GraphDefDispatcher.java
--- src/org/eclipse/gmf/graphdef/codegen/GraphDefDispatcher.java 6 Feb 2006 22:21:42 -0000 1.1
+++ src/org/eclipse/gmf/graphdef/codegen/GraphDefDispatcher.java 9 Feb 2006 18:41:51 -0000
@@ -30,7 +30,7 @@
myImportManager = importManager;
myFqnSwitch = fqnSwitch;
}
-
+
public ImportAssistant getImportManager() {
return myImportManager;
}
@@ -38,8 +38,7 @@
public GMFGraphSwitch getFQNSwitch() {
return myFqnSwitch;
}
-
-
+
public Args create(Figure figure, String figureVarName) {
return new Args(this, figure, figureVarName);
}
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.2
diff -u -r1.2 Figure.javajet
--- templates/children/Figure.javajet 6 Feb 2006 22:21:42 -0000 1.2
+++ templates/children/Figure.javajet 9 Feb 2006 18:41:51 -0000
@@ -1,5 +1,5 @@
<%@ jet package="org.eclipse.gmf.graphdef.codegen.templates" class="FigureChildrenGenerator"
- imports="org.eclipse.gmf.gmfgraph.* org.eclipse.gmf.graphdef.codegen.GraphDefDispatcher java.util.*"%>
+ imports="org.eclipse.gmf.gmfgraph.* org.eclipse.gmf.graphdef.codegen.* java.util.*"%>
<%
Object[] args = (Object[]) argument;
List/**/ figureChildren = (List) args[0];
@@ -23,10 +23,14 @@
if (figureMarker instanceof FigureRef) {
throw new IllegalStateException("FIXME: sorry, don't support FigureRef for a while");
}
- final String figureVarName = "fig" + (figureCount++);%>
+ final String figureVarName = "fig" + figureCount;
+ final String layoutDataVarName = "layData" + figureCount;
+ figureCount++;%>
// FIXME instantiate - FigureRef - dispatch to 'instantiate' template?
<%=dispatcher.dispatch("instantiate", dispatcher.create((Figure) figureMarker, figureVarName))%>
<%=parentFigureVarName%>.add(<%=figureVarName%>);
+ <%=dispatcher.dispatch("createLayoutData",
+ new LayoutGeneratorArguments(dispatcher, (Figure)figureMarker, figureVarName, layoutDataVarName))%>
<%
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.2
diff -u -r1.2 Figure.javajet
--- templates/new/Figure.javajet 6 Feb 2006 22:21:42 -0000 1.2
+++ templates/new/Figure.javajet 9 Feb 2006 18:41:51 -0000
@@ -1,5 +1,5 @@
<%@ jet package="org.eclipse.gmf.graphdef.codegen.templates" class="NewFigureGenerator"
- imports="org.eclipse.gmf.gmfgraph.* org.eclipse.gmf.graphdef.codegen.GraphDefDispatcher"%>
+ imports="org.eclipse.gmf.gmfgraph.* org.eclipse.gmf.graphdef.codegen.*"%>
<%
GraphDefDispatcher.Args args = (GraphDefDispatcher.Args) argument;
final Figure figureInstance = args.getFigure();
@@ -10,4 +10,5 @@
// PRODUCES instance AND (!) initializes attributes
%>
<%=figureClassName%> <%=figureVarName%> = new <%=figureClassName%>();
-<%=args.getDispatcher().dispatch(figureInstance, args)%>
\ No newline at end of file
+<%=args.getDispatcher().dispatch(figureInstance, args)%>
+<%=args.getDispatcher().dispatch("createLayout", new LayoutGeneratorArguments(args))%>
Index: templates/attr/CustomConfigurableClass.javajet
===================================================================
RCS file: templates/attr/CustomConfigurableClass.javajet
diff -N templates/attr/CustomConfigurableClass.javajet
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ templates/attr/CustomConfigurableClass.javajet 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,64 @@
+<%@ jet package="org.eclipse.gmf.graphdef.codegen.templates" class="CustomClassAttributesGenerator"
+ imports="org.eclipse.gmf.gmfgraph.* org.eclipse.gmf.graphdef.codegen.* java.util.* "%>
+<%
+CustomClassArguments args = (CustomClassArguments) argument;
+final CustomConfigurableClass instance = args.getCustomInstance();
+final String varName = args.getVariableName();
+
+class TextUtils {
+ public String capitalizeFirst(String text){
+ return text.length() <= 1 ?
+ text.toUpperCase() :
+ Character.toUpperCase(text.charAt(0)) + text.substring(1);
+ }
+
+ public String replaceAll(String text, String subject, String replace){
+ StringBuffer result = new StringBuffer();
+ int currentIndex = 0;
+ while (true){
+ int nextOccurrence = text.indexOf(subject, currentIndex);
+ if (nextOccurrence < 0){
+ result.append(text.substring(currentIndex));
+ break;
+ }
+ result.append(text.substring(currentIndex, nextOccurrence));
+ result.append(replace);
+ currentIndex = nextOccurrence + subject.length();
+ }
+ return result.toString();
+ }
+}
+
+final TextUtils textUtils = new TextUtils();
+%>
+
+ {
+<%
+int attrIndex = 0;
+for (Iterator attrs = instance.getAttributes().iterator(); attrs.hasNext(); attrIndex++){
+ CustomAttribute next = (CustomAttribute) attrs.next();
+ String valueVarName = next.getValue();
+ if (next.isMultiStatementValue()){
+%>
+ <%=next.getType()%> attr<%=attrIndex%>;
+ <%=textUtils.replaceAll(valueVarName, "%%%", "attr" + attrIndex)%>;
+<%
+ valueVarName = "attr" + attrIndex;
+ }
+%>
+<%
+ if (next.isDirectAccess()){
+%>
+ <%=varName%>.<%=next.getName()%> = <%=valueVarName%>;
+<%
+ } else {
+%>
+ <%=varName%>.set<%=textUtils.capitalizeFirst(next.getName())%>(<%=valueVarName%>);
+<%
+ }
+%>
+<%
+} //for
+%>
+ }
+
Index: src/org/eclipse/gmf/graphdef/codegen/templates/CustomClassAttributesGenerator.java
===================================================================
RCS file: src/org/eclipse/gmf/graphdef/codegen/templates/CustomClassAttributesGenerator.java
diff -N src/org/eclipse/gmf/graphdef/codegen/templates/CustomClassAttributesGenerator.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/graphdef/codegen/templates/CustomClassAttributesGenerator.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,122 @@
+package org.eclipse.gmf.graphdef.codegen.templates;
+
+import org.eclipse.gmf.gmfgraph.*;
+import org.eclipse.gmf.graphdef.codegen.*;
+import java.util.*;
+
+public class CustomClassAttributesGenerator
+{
+ protected static String nl;
+ public static synchronized CustomClassAttributesGenerator create(String lineSeparator)
+ {
+ nl = lineSeparator;
+ CustomClassAttributesGenerator result = new CustomClassAttributesGenerator();
+ nl = null;
+ return result;
+ }
+
+ protected final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
+ protected final String TEXT_1 = NL + "\t\t{";
+ protected final String TEXT_2 = NL + "\t\t\t";
+ protected final String TEXT_3 = " attr";
+ protected final String TEXT_4 = ";" + NL + "\t\t\t";
+ protected final String TEXT_5 = ";";
+ protected final String TEXT_6 = "\t\t";
+ protected final String TEXT_7 = NL + "\t\t\t";
+ protected final String TEXT_8 = ".";
+ protected final String TEXT_9 = " = ";
+ protected final String TEXT_10 = ";\t\t";
+ protected final String TEXT_11 = NL + "\t\t\t";
+ protected final String TEXT_12 = ".set";
+ protected final String TEXT_13 = "(";
+ protected final String TEXT_14 = ");";
+ protected final String TEXT_15 = "\t";
+ protected final String TEXT_16 = NL + "\t\t}" + NL;
+ protected final String TEXT_17 = NL;
+
+ public String generate(Object argument)
+ {
+ StringBuffer stringBuffer = new StringBuffer();
+
+CustomClassArguments args = (CustomClassArguments) argument;
+final CustomConfigurableClass instance = args.getCustomInstance();
+final String varName = args.getVariableName();
+
+class TextUtils {
+ public String capitalizeFirst(String text){
+ return text.length() <= 1 ?
+ text.toUpperCase() :
+ Character.toUpperCase(text.charAt(0)) + text.substring(1);
+ }
+
+ public String replaceAll(String text, String subject, String replace){
+ StringBuffer result = new StringBuffer();
+ int currentIndex = 0;
+ while (true){
+ int nextOccurrence = text.indexOf(subject, currentIndex);
+ if (nextOccurrence < 0){
+ result.append(text.substring(currentIndex));
+ break;
+ }
+ result.append(text.substring(currentIndex, nextOccurrence));
+ result.append(replace);
+ currentIndex = nextOccurrence + subject.length();
+ }
+ return result.toString();
+ }
+}
+
+final TextUtils textUtils = new TextUtils();
+
+ stringBuffer.append(TEXT_1);
+
+int attrIndex = 0;
+for (Iterator attrs = instance.getAttributes().iterator(); attrs.hasNext(); attrIndex++){
+ CustomAttribute next = (CustomAttribute) attrs.next();
+ String valueVarName = next.getValue();
+ if (next.isMultiStatementValue()){
+
+ stringBuffer.append(TEXT_2);
+ stringBuffer.append(next.getType());
+ stringBuffer.append(TEXT_3);
+ stringBuffer.append(attrIndex);
+ stringBuffer.append(TEXT_4);
+ stringBuffer.append(textUtils.replaceAll(valueVarName, "%%%", "attr" + attrIndex));
+ stringBuffer.append(TEXT_5);
+
+ valueVarName = "attr" + attrIndex;
+ }
+
+ stringBuffer.append(TEXT_6);
+
+ if (next.isDirectAccess()){
+
+ stringBuffer.append(TEXT_7);
+ stringBuffer.append(varName);
+ stringBuffer.append(TEXT_8);
+ stringBuffer.append(next.getName());
+ stringBuffer.append(TEXT_9);
+ stringBuffer.append(valueVarName);
+ stringBuffer.append(TEXT_10);
+
+ } else {
+
+ stringBuffer.append(TEXT_11);
+ stringBuffer.append(varName);
+ stringBuffer.append(TEXT_12);
+ stringBuffer.append(textUtils.capitalizeFirst(next.getName()));
+ stringBuffer.append(TEXT_13);
+ stringBuffer.append(valueVarName);
+ stringBuffer.append(TEXT_14);
+
+ }
+
+ stringBuffer.append(TEXT_15);
+
+} //for
+
+ stringBuffer.append(TEXT_16);
+ stringBuffer.append(TEXT_17);
+ return stringBuffer.toString();
+ }
+}
Index: templates/layoutData/GridLayoutData.javajet
===================================================================
RCS file: templates/layoutData/GridLayoutData.javajet
diff -N templates/layoutData/GridLayoutData.javajet
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ templates/layoutData/GridLayoutData.javajet 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,26 @@
+
+<%@ jet package="org.eclipse.gmf.graphdef.codegen.templates" class="InitGridLayoutDataGenerator"
+ imports="org.eclipse.gmf.gmfgraph.* org.eclipse.gmf.graphdef.codegen.*"%>
+<%
+LayoutGeneratorArguments argsBundle = (LayoutGeneratorArguments) argument;
+final GridLayoutData gmfLayoutData = (GridLayoutData)argsBundle.getFigure().getData();
+final String layoutConstraintVarName = argsBundle.getLayoutVariableName();
+%>
+
+ <%=layoutConstraintVarName%>.verticalAlignment = <%=gmfLayoutData.getVerticalAlignment().getValue()%>;
+ <%=layoutConstraintVarName%>.horizontalAlignment = <%=gmfLayoutData.getHorizontalAlignment().getValue()%>;
+<%
+Dimension sizeHint = gmfLayoutData.getSizeHint();
+if (sizeHint != null){
+%>
+ <%=layoutConstraintVarName%>.widthHint = <%=sizeHint.getDx()%>;
+ <%=layoutConstraintVarName%>.heightHint = <%=sizeHint.getDy()%>;
+<%
+}
+%>
+ <%=layoutConstraintVarName%>.horizontalIndent = <%=gmfLayoutData.getHorizontalIndent()%>;
+ <%=layoutConstraintVarName%>.horizontalSpan = <%=gmfLayoutData.getHorizontalSpan()%>;
+ <%=layoutConstraintVarName%>.verticalSpan = <%=gmfLayoutData.getVerticalSpan()%>;
+ <%=layoutConstraintVarName%>.grabExcessHorizontalSpace = <%=gmfLayoutData.isGrabExcessHorizontalSpace()%>;
+ <%=layoutConstraintVarName%>.grabExcessVerticalSpace = <%=gmfLayoutData.isGrabExcessVerticalSpace()%>;
+
Index: src/org/eclipse/gmf/graphdef/codegen/templates/InitBorderLayoutDataGenerator.java
===================================================================
RCS file: src/org/eclipse/gmf/graphdef/codegen/templates/InitBorderLayoutDataGenerator.java
diff -N src/org/eclipse/gmf/graphdef/codegen/templates/InitBorderLayoutDataGenerator.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/graphdef/codegen/templates/InitBorderLayoutDataGenerator.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,93 @@
+package org.eclipse.gmf.graphdef.codegen.templates;
+
+import org.eclipse.gmf.gmfgraph.*;
+import org.eclipse.gmf.graphdef.codegen.*;
+
+public class InitBorderLayoutDataGenerator
+{
+ protected static String nl;
+ public static synchronized InitBorderLayoutDataGenerator create(String lineSeparator)
+ {
+ nl = lineSeparator;
+ InitBorderLayoutDataGenerator result = new InitBorderLayoutDataGenerator();
+ nl = null;
+ return result;
+ }
+
+ 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\t";
+ protected final String TEXT_3 = " = org.eclipse.draw2d.BorderLayout.CENTER;";
+ protected final String TEXT_4 = "\t\t\t" + NL + "\t\t\t";
+ protected final String TEXT_5 = " = org.eclipse.draw2d.BorderLayout.TOP;";
+ protected final String TEXT_6 = NL + "\t\t\t";
+ protected final String TEXT_7 = " = org.eclipse.draw2d.BorderLayout.LEFT;";
+ protected final String TEXT_8 = "\t\t\t" + NL + "\t\t\t";
+ protected final String TEXT_9 = " = org.eclipse.draw2d.BorderLayout.BOTTOM;";
+ protected final String TEXT_10 = NL + "\t\t\t";
+ protected final String TEXT_11 = " = org.eclipse.draw2d.BorderLayout.RIGHT;";
+ protected final String TEXT_12 = NL;
+ protected final String TEXT_13 = NL;
+
+ public String generate(Object argument)
+ {
+ StringBuffer stringBuffer = new StringBuffer();
+
+LayoutGeneratorArguments argsBundle = (LayoutGeneratorArguments) argument;
+final BorderLayoutData gmfLayoutData = (BorderLayoutData)argsBundle.getFigure().getData();
+final String layoutConstraintVarName = argsBundle.getLayoutVariableName();
+
+ stringBuffer.append(TEXT_1);
+
+Alignment alignment = gmfLayoutData.getAlignment();
+if (alignment == null){
+ alignment = Alignment.CENTER_LITERAL;
+}
+switch(alignment.getValue()){
+ case Alignment.CENTER:
+ case Alignment.FILL:
+
+ stringBuffer.append(TEXT_2);
+ stringBuffer.append(layoutConstraintVarName);
+ stringBuffer.append(TEXT_3);
+
+ break;
+ case Alignment.BEGINNING:
+ if (gmfLayoutData.isVertical()){
+
+ stringBuffer.append(TEXT_4);
+ stringBuffer.append(layoutConstraintVarName);
+ stringBuffer.append(TEXT_5);
+
+ } else {
+
+ stringBuffer.append(TEXT_6);
+ stringBuffer.append(layoutConstraintVarName);
+ stringBuffer.append(TEXT_7);
+
+ }
+ break;
+ case Alignment.END:
+ if (gmfLayoutData.isVertical()){
+
+ stringBuffer.append(TEXT_8);
+ stringBuffer.append(layoutConstraintVarName);
+ stringBuffer.append(TEXT_9);
+
+ } else {
+
+ stringBuffer.append(TEXT_10);
+ stringBuffer.append(layoutConstraintVarName);
+ stringBuffer.append(TEXT_11);
+
+ }
+ break;
+ default:
+ throw new IllegalArgumentException("Unknown Alignment: " + gmfLayoutData.getAlignment());
+}
+
+ stringBuffer.append(TEXT_12);
+ stringBuffer.append(TEXT_13);
+ return stringBuffer.toString();
+ }
+}
Index: src/org/eclipse/gmf/graphdef/codegen/LayoutGeneratorArguments.java
===================================================================
RCS file: src/org/eclipse/gmf/graphdef/codegen/LayoutGeneratorArguments.java
diff -N src/org/eclipse/gmf/graphdef/codegen/LayoutGeneratorArguments.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/graphdef/codegen/LayoutGeneratorArguments.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,35 @@
+package org.eclipse.gmf.graphdef.codegen;
+
+import org.eclipse.gmf.gmfgraph.Figure;
+
+public class LayoutGeneratorArguments extends GraphDefDispatcher.Args {
+
+ private final String myLayoutVariableName;
+
+ /**
+ * @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
+ */
+ public LayoutGeneratorArguments(GraphDefDispatcher owner, Figure figure,
+ String figureVarName, String layoutVariableName) {
+ super(owner, figure, figureVarName);
+ myLayoutVariableName = layoutVariableName;
+ }
+
+ public LayoutGeneratorArguments(GraphDefDispatcher.Args args,
+ String layoutVariableName) {
+ this(args.getDispatcher(), args.getFigure(), args.getVariableName(),
+ layoutVariableName);
+ }
+
+ public LayoutGeneratorArguments(GraphDefDispatcher.Args args) {
+ this(args, args.getVariableName() + "Layout");
+ }
+
+ public String getLayoutVariableName() {
+ return myLayoutVariableName;
+ }
+
+}
Index: templates/layout/GridLayout.javajet
===================================================================
RCS file: templates/layout/GridLayout.javajet
diff -N templates/layout/GridLayout.javajet
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ templates/layout/GridLayout.javajet 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,25 @@
+<%@ jet package="org.eclipse.gmf.graphdef.codegen.templates" class="InitGridLayoutGenerator"
+ imports="org.eclipse.gmf.gmfgraph.* org.eclipse.gmf.graphdef.codegen.*"%>
+<%
+LayoutGeneratorArguments argsBundle = (LayoutGeneratorArguments) argument;
+final GridLayout gmfLayout = (GridLayout)argsBundle.getFigure().getLayout();
+final String layouterVarName = argsBundle.getLayoutVariableName();
+%>
+ <%=layouterVarName%>.numColumns = <%=gmfLayout.getNumColumns()%>;
+ <%=layouterVarName%>.makeColumnsEqualWidth = <%=gmfLayout.isEqualWidth()%>;
+<%
+Dimension margins = gmfLayout.getMargins();
+if (margins != null){
+%>
+ <%=layouterVarName%>.marginWidth = <%=margins.getDx()%>;
+ <%=layouterVarName%>.marginHeight = <%=margins.getDy()%>;
+<%
+}
+Dimension spacing = gmfLayout.getSpacing();
+if (spacing != null){
+%>
+ <%=layouterVarName%>.horizontalSpacing = <%=spacing.getDx()%>;
+ <%=layouterVarName%>.verticalSpacing = <%=spacing.getDy()%>;
+<%
+}
+%>
Index: src/org/eclipse/gmf/graphdef/codegen/templates/InitGridLayoutGenerator.java
===================================================================
RCS file: src/org/eclipse/gmf/graphdef/codegen/templates/InitGridLayoutGenerator.java
diff -N src/org/eclipse/gmf/graphdef/codegen/templates/InitGridLayoutGenerator.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/graphdef/codegen/templates/InitGridLayoutGenerator.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,85 @@
+package org.eclipse.gmf.graphdef.codegen.templates;
+
+import org.eclipse.gmf.gmfgraph.*;
+import org.eclipse.gmf.graphdef.codegen.*;
+
+public class InitGridLayoutGenerator
+{
+ protected static String nl;
+ public static synchronized InitGridLayoutGenerator create(String lineSeparator)
+ {
+ nl = lineSeparator;
+ InitGridLayoutGenerator result = new InitGridLayoutGenerator();
+ 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 = ".numColumns = ";
+ protected final String TEXT_3 = ";" + NL + "\t\t";
+ protected final String TEXT_4 = ".makeColumnsEqualWidth = ";
+ protected final String TEXT_5 = ";";
+ protected final String TEXT_6 = NL + "\t\t";
+ protected final String TEXT_7 = ".marginWidth = ";
+ protected final String TEXT_8 = ";" + NL + "\t\t";
+ protected final String TEXT_9 = ".marginHeight = ";
+ protected final String TEXT_10 = ";";
+ protected final String TEXT_11 = NL + "\t\t";
+ protected final String TEXT_12 = ".horizontalSpacing = ";
+ protected final String TEXT_13 = ";" + NL + "\t\t";
+ protected final String TEXT_14 = ".verticalSpacing = ";
+ protected final String TEXT_15 = ";";
+ protected final String TEXT_16 = NL;
+
+ public String generate(Object argument)
+ {
+ StringBuffer stringBuffer = new StringBuffer();
+
+LayoutGeneratorArguments argsBundle = (LayoutGeneratorArguments) argument;
+final GridLayout gmfLayout = (GridLayout)argsBundle.getFigure().getLayout();
+final String layouterVarName = argsBundle.getLayoutVariableName();
+
+ stringBuffer.append(TEXT_1);
+ stringBuffer.append(layouterVarName);
+ stringBuffer.append(TEXT_2);
+ stringBuffer.append(gmfLayout.getNumColumns());
+ stringBuffer.append(TEXT_3);
+ stringBuffer.append(layouterVarName);
+ stringBuffer.append(TEXT_4);
+ stringBuffer.append(gmfLayout.isEqualWidth());
+ stringBuffer.append(TEXT_5);
+
+Dimension margins = gmfLayout.getMargins();
+if (margins != null){
+
+ stringBuffer.append(TEXT_6);
+ stringBuffer.append(layouterVarName);
+ stringBuffer.append(TEXT_7);
+ stringBuffer.append(margins.getDx());
+ stringBuffer.append(TEXT_8);
+ stringBuffer.append(layouterVarName);
+ stringBuffer.append(TEXT_9);
+ stringBuffer.append(margins.getDy());
+ stringBuffer.append(TEXT_10);
+
+}
+Dimension spacing = gmfLayout.getSpacing();
+if (spacing != null){
+
+ stringBuffer.append(TEXT_11);
+ stringBuffer.append(layouterVarName);
+ stringBuffer.append(TEXT_12);
+ stringBuffer.append(spacing.getDx());
+ stringBuffer.append(TEXT_13);
+ stringBuffer.append(layouterVarName);
+ stringBuffer.append(TEXT_14);
+ stringBuffer.append(spacing.getDy());
+ stringBuffer.append(TEXT_15);
+
+}
+
+ stringBuffer.append(TEXT_16);
+ return stringBuffer.toString();
+ }
+}
Index: src/org/eclipse/gmf/graphdef/codegen/CustomClassArguments.java
===================================================================
RCS file: src/org/eclipse/gmf/graphdef/codegen/CustomClassArguments.java
diff -N src/org/eclipse/gmf/graphdef/codegen/CustomClassArguments.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/graphdef/codegen/CustomClassArguments.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,22 @@
+package org.eclipse.gmf.graphdef.codegen;
+
+import org.eclipse.gmf.gmfgraph.CustomConfigurableClass;
+
+public class CustomClassArguments {
+ private final String myVariableName;
+ private final CustomConfigurableClass myCustomInstance;
+
+ public CustomClassArguments(CustomConfigurableClass customInstance, String variableName){
+ myCustomInstance = customInstance;
+ myVariableName = variableName;
+ }
+
+ public CustomConfigurableClass getCustomInstance() {
+ return myCustomInstance;
+ }
+
+ public String getVariableName() {
+ return myVariableName;
+ }
+
+}
Index: src/org/eclipse/gmf/graphdef/codegen/templates/InitCustomLayoutGenerator.java
===================================================================
RCS file: src/org/eclipse/gmf/graphdef/codegen/templates/InitCustomLayoutGenerator.java
diff -N src/org/eclipse/gmf/graphdef/codegen/templates/InitCustomLayoutGenerator.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/graphdef/codegen/templates/InitCustomLayoutGenerator.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,36 @@
+package org.eclipse.gmf.graphdef.codegen.templates;
+
+import org.eclipse.gmf.gmfgraph.*;
+import org.eclipse.gmf.graphdef.codegen.*;
+
+public class InitCustomLayoutGenerator
+{
+ protected static String nl;
+ public static synchronized InitCustomLayoutGenerator create(String lineSeparator)
+ {
+ nl = lineSeparator;
+ InitCustomLayoutGenerator result = new InitCustomLayoutGenerator();
+ nl = null;
+ return result;
+ }
+
+ protected final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
+ protected final String TEXT_1 = "";
+ protected final String TEXT_2 = NL;
+ protected final String TEXT_3 = NL;
+
+ public String generate(Object argument)
+ {
+ StringBuffer stringBuffer = new StringBuffer();
+
+final LayoutGeneratorArguments args = (LayoutGeneratorArguments) argument;
+final CustomLayout layout = (CustomLayout)args.getFigure().getLayout();
+final CustomClassArguments callArgs = new CustomClassArguments(layout, args.getLayoutVariableName());
+
+ stringBuffer.append(TEXT_1);
+ stringBuffer.append(TEXT_2);
+ stringBuffer.append(args.getDispatcher().dispatch("customAttributes", callArgs));
+ stringBuffer.append(TEXT_3);
+ return stringBuffer.toString();
+ }
+}
Index: src/org/eclipse/gmf/graphdef/codegen/templates/NewLayoutGenerator.java
===================================================================
RCS file: src/org/eclipse/gmf/graphdef/codegen/templates/NewLayoutGenerator.java
diff -N src/org/eclipse/gmf/graphdef/codegen/templates/NewLayoutGenerator.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/graphdef/codegen/templates/NewLayoutGenerator.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,62 @@
+package org.eclipse.gmf.graphdef.codegen.templates;
+
+import org.eclipse.gmf.gmfgraph.*;
+import org.eclipse.gmf.graphdef.codegen.*;
+
+public class NewLayoutGenerator
+{
+ protected static String nl;
+ public static synchronized NewLayoutGenerator create(String lineSeparator)
+ {
+ nl = lineSeparator;
+ NewLayoutGenerator result = new NewLayoutGenerator();
+ nl = null;
+ return result;
+ }
+
+ 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 = " ";
+ protected final String TEXT_4 = " = new ";
+ protected final String TEXT_5 = "();" + NL + "\t\t";
+ protected final String TEXT_6 = "\t" + NL + "\t\t";
+ protected final String TEXT_7 = ".setLayoutManager(";
+ protected final String TEXT_8 = ");";
+ protected final String TEXT_9 = NL;
+
+ public String generate(Object argument)
+ {
+ StringBuffer stringBuffer = new StringBuffer();
+
+LayoutGeneratorArguments argsBundle = (LayoutGeneratorArguments) argument;
+final FigureMarker figureMarker = argsBundle.getFigure();
+final String figureVarName = argsBundle.getVariableName();
+final String layouterVarName = argsBundle.getLayoutVariableName();
+
+ stringBuffer.append(TEXT_1);
+
+Layout gmfLayout= figureMarker.getLayout();
+if (gmfLayout != null){
+ final String layouterImplClass = argsBundle.getDispatcher().getImportManager().getImportedName(gmfLayout.getQualifiedClassName());
+
+ stringBuffer.append(TEXT_2);
+ stringBuffer.append(layouterImplClass);
+ stringBuffer.append(TEXT_3);
+ stringBuffer.append(layouterVarName);
+ stringBuffer.append(TEXT_4);
+ stringBuffer.append(layouterImplClass);
+ stringBuffer.append(TEXT_5);
+ stringBuffer.append(argsBundle.getDispatcher().dispatch(gmfLayout, argsBundle));
+ stringBuffer.append(TEXT_6);
+ stringBuffer.append(figureVarName);
+ stringBuffer.append(TEXT_7);
+ stringBuffer.append(layouterVarName);
+ stringBuffer.append(TEXT_8);
+
+}
+
+ stringBuffer.append(TEXT_9);
+ return stringBuffer.toString();
+ }
+}
Index: src/org/eclipse/gmf/graphdef/codegen/templates/NewLayoutDataGenerator.java
===================================================================
RCS file: src/org/eclipse/gmf/graphdef/codegen/templates/NewLayoutDataGenerator.java
diff -N src/org/eclipse/gmf/graphdef/codegen/templates/NewLayoutDataGenerator.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/graphdef/codegen/templates/NewLayoutDataGenerator.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,73 @@
+package org.eclipse.gmf.graphdef.codegen.templates;
+
+import org.eclipse.gmf.gmfgraph.*;
+import org.eclipse.gmf.graphdef.codegen.*;
+
+public class NewLayoutDataGenerator
+{
+ protected static String nl;
+ public static synchronized NewLayoutDataGenerator create(String lineSeparator)
+ {
+ nl = lineSeparator;
+ NewLayoutDataGenerator result = new NewLayoutDataGenerator();
+ nl = null;
+ return result;
+ }
+
+ protected final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
+ protected final String TEXT_1 = NL + "\t\tif (";
+ protected final String TEXT_2 = ".getParent() != null && ";
+ protected final String TEXT_3 = ".getParent().getLayoutManager() != null) {" + NL + "\t\t\t";
+ protected final String TEXT_4 = " ";
+ protected final String TEXT_5 = " = new ";
+ protected final String TEXT_6 = "();" + NL + "\t\t\t";
+ protected final String TEXT_7 = "\t\t\t" + NL + "\t\t\t";
+ protected final String TEXT_8 = ".getParent().getLayoutManager().setConstraint(";
+ protected final String TEXT_9 = ", ";
+ protected final String TEXT_10 = ");" + NL + "\t\t}";
+ protected final String TEXT_11 = NL;
+ protected final String TEXT_12 = NL;
+
+ public String generate(Object argument)
+ {
+ StringBuffer stringBuffer = new StringBuffer();
+
+// NOTE: this code expects that constrainted figure is already added to its parent
+
+LayoutGeneratorArguments argsBundle = (LayoutGeneratorArguments) argument;
+final FigureMarker figureMarker = argsBundle.getFigure();
+final String figureVarName = argsBundle.getVariableName();
+final String layoutDataVarName = argsBundle.getLayoutVariableName();
+
+
+LayoutData gmfLayoutData = figureMarker.getData();
+if (gmfLayoutData != null){
+ String layoutImplClassName = argsBundle.getDispatcher().getImportManager().getImportedName(gmfLayoutData.getQualifiedClassName());
+
+ stringBuffer.append(TEXT_1);
+ stringBuffer.append(figureVarName);
+ stringBuffer.append(TEXT_2);
+ stringBuffer.append(figureVarName);
+ stringBuffer.append(TEXT_3);
+ stringBuffer.append(layoutImplClassName);
+ stringBuffer.append(TEXT_4);
+ stringBuffer.append(layoutDataVarName);
+ stringBuffer.append(TEXT_5);
+ stringBuffer.append(layoutImplClassName);
+ stringBuffer.append(TEXT_6);
+ stringBuffer.append(argsBundle.getDispatcher().dispatch(gmfLayoutData, argsBundle));
+ stringBuffer.append(TEXT_7);
+ stringBuffer.append(figureVarName);
+ stringBuffer.append(TEXT_8);
+ stringBuffer.append(figureVarName);
+ stringBuffer.append(TEXT_9);
+ stringBuffer.append(layoutDataVarName);
+ stringBuffer.append(TEXT_10);
+
+}
+
+ stringBuffer.append(TEXT_11);
+ stringBuffer.append(TEXT_12);
+ return stringBuffer.toString();
+ }
+}
Index: templates/layout/FigureMarker.javajet
===================================================================
RCS file: templates/layout/FigureMarker.javajet
diff -N templates/layout/FigureMarker.javajet
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ templates/layout/FigureMarker.javajet 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,20 @@
+<%@ jet package="org.eclipse.gmf.graphdef.codegen.templates" class="NewLayoutGenerator"
+ imports="org.eclipse.gmf.gmfgraph.* org.eclipse.gmf.graphdef.codegen.*"%>
+<%
+LayoutGeneratorArguments argsBundle = (LayoutGeneratorArguments) argument;
+final FigureMarker figureMarker = argsBundle.getFigure();
+final String figureVarName = argsBundle.getVariableName();
+final String layouterVarName = argsBundle.getLayoutVariableName();
+%>
+
+<%
+Layout gmfLayout= figureMarker.getLayout();
+if (gmfLayout != null){
+ final String layouterImplClass = argsBundle.getDispatcher().getImportManager().getImportedName(gmfLayout.getQualifiedClassName());
+%>
+ <%=layouterImplClass%> <%=layouterVarName%> = new <%=layouterImplClass%>();
+ <%=argsBundle.getDispatcher().dispatch(gmfLayout, argsBundle)%>
+ <%=figureVarName%>.setLayoutManager(<%=layouterVarName%>);
+<%
+}
+%>
Index: templates/layout/BorderLayout.javajet
===================================================================
RCS file: templates/layout/BorderLayout.javajet
diff -N templates/layout/BorderLayout.javajet
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ templates/layout/BorderLayout.javajet 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,17 @@
+<%@ jet package="org.eclipse.gmf.graphdef.codegen.templates" class="InitBorderLayoutGenerator"
+ imports="org.eclipse.gmf.gmfgraph.* org.eclipse.gmf.graphdef.codegen.*"%>
+<%
+LayoutGeneratorArguments argsBundle = (LayoutGeneratorArguments) argument;
+final BorderLayout gmfLayout = (BorderLayout)argsBundle.getFigure().getLayout();
+final String layouterVarName = argsBundle.getLayoutVariableName();
+%>
+
+<%
+Dimension spacing = gmfLayout.getSpacing();
+if (spacing != null){
+%>
+ <%=layouterVarName%>.setHorizontalSpacing(<%=spacing.getDx()%>);
+ <%=layouterVarName%>.setVerticalSpacing(<%=spacing.getDy()%>);
+<%
+}
+%>
Index: templates/layoutData/BorderLayoutData.javajet
===================================================================
RCS file: templates/layoutData/BorderLayoutData.javajet
diff -N templates/layoutData/BorderLayoutData.javajet
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ templates/layoutData/BorderLayoutData.javajet 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,47 @@
+<%@ jet package="org.eclipse.gmf.graphdef.codegen.templates" class="InitBorderLayoutDataGenerator"
+ imports="org.eclipse.gmf.gmfgraph.* org.eclipse.gmf.graphdef.codegen.*"%>
+<%
+LayoutGeneratorArguments argsBundle = (LayoutGeneratorArguments) argument;
+final BorderLayoutData gmfLayoutData = (BorderLayoutData)argsBundle.getFigure().getData();
+final String layoutConstraintVarName = argsBundle.getLayoutVariableName();
+%>
+
+<%
+Alignment alignment = gmfLayoutData.getAlignment();
+if (alignment == null){
+ alignment = Alignment.CENTER_LITERAL;
+}
+switch(alignment.getValue()){
+ case Alignment.CENTER:
+ case Alignment.FILL:
+%>
+ <%=layoutConstraintVarName%> = org.eclipse.draw2d.BorderLayout.CENTER;
+<%
+ break;
+ case Alignment.BEGINNING:
+ if (gmfLayoutData.isVertical()){
+%>
+ <%=layoutConstraintVarName%> = org.eclipse.draw2d.BorderLayout.TOP;
+<%
+ } else {
+%>
+ <%=layoutConstraintVarName%> = org.eclipse.draw2d.BorderLayout.LEFT;
+<%
+ }
+ break;
+ case Alignment.END:
+ if (gmfLayoutData.isVertical()){
+%>
+ <%=layoutConstraintVarName%> = org.eclipse.draw2d.BorderLayout.BOTTOM;
+<%
+ } else {
+%>
+ <%=layoutConstraintVarName%> = org.eclipse.draw2d.BorderLayout.RIGHT;
+<%
+ }
+ break;
+ default:
+ throw new IllegalArgumentException("Unknown Alignment: " + gmfLayoutData.getAlignment());
+}
+%>
+
Index: templates/layoutData/CustomLayoutData.javajet
===================================================================
RCS file: templates/layoutData/CustomLayoutData.javajet
diff -N templates/layoutData/CustomLayoutData.javajet
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ templates/layoutData/CustomLayoutData.javajet 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,9 @@
+<%@ jet package="org.eclipse.gmf.graphdef.codegen.templates" class="InitCustomLayoutGenerator"
+ imports="org.eclipse.gmf.gmfgraph.* org.eclipse.gmf.graphdef.codegen.*"%>
+<%
+final LayoutGeneratorArguments args = (LayoutGeneratorArguments) argument;
+final CustomLayout layout = (CustomLayout)args.getFigure().getLayout();
+final CustomClassArguments callArgs = new CustomClassArguments(layout, args.getLayoutVariableName());
+%>
+
+<%=args.getDispatcher().dispatch("customAttributes", callArgs)%>
Index: src/org/eclipse/gmf/graphdef/codegen/templates/InitGridLayoutDataGenerator.java
===================================================================
RCS file: src/org/eclipse/gmf/graphdef/codegen/templates/InitGridLayoutDataGenerator.java
diff -N src/org/eclipse/gmf/graphdef/codegen/templates/InitGridLayoutDataGenerator.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/graphdef/codegen/templates/InitGridLayoutDataGenerator.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,98 @@
+package org.eclipse.gmf.graphdef.codegen.templates;
+
+import org.eclipse.gmf.gmfgraph.*;
+import org.eclipse.gmf.graphdef.codegen.*;
+
+public class InitGridLayoutDataGenerator
+{
+ protected static String nl;
+ public static synchronized InitGridLayoutDataGenerator create(String lineSeparator)
+ {
+ nl = lineSeparator;
+ InitGridLayoutDataGenerator result = new InitGridLayoutDataGenerator();
+ nl = null;
+ return result;
+ }
+
+ protected final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
+ protected final String TEXT_1 = NL + "\t\t\t";
+ protected final String TEXT_2 = ".verticalAlignment = ";
+ protected final String TEXT_3 = ";" + NL + "\t\t\t";
+ protected final String TEXT_4 = ".horizontalAlignment = ";
+ protected final String TEXT_5 = ";";
+ protected final String TEXT_6 = NL + "\t\t\t";
+ protected final String TEXT_7 = ".widthHint = ";
+ protected final String TEXT_8 = ";" + NL + "\t\t\t";
+ protected final String TEXT_9 = ".heightHint = ";
+ protected final String TEXT_10 = ";";
+ protected final String TEXT_11 = NL + "\t\t\t";
+ protected final String TEXT_12 = ".horizontalIndent = ";
+ protected final String TEXT_13 = ";" + NL + "\t\t\t";
+ protected final String TEXT_14 = ".horizontalSpan = ";
+ protected final String TEXT_15 = ";" + NL + "\t\t\t";
+ protected final String TEXT_16 = ".verticalSpan = ";
+ protected final String TEXT_17 = ";" + NL + "\t\t\t";
+ protected final String TEXT_18 = ".grabExcessHorizontalSpace = ";
+ protected final String TEXT_19 = ";" + NL + "\t\t\t";
+ protected final String TEXT_20 = ".grabExcessVerticalSpace = ";
+ protected final String TEXT_21 = ";" + NL;
+ protected final String TEXT_22 = NL;
+
+ public String generate(Object argument)
+ {
+ StringBuffer stringBuffer = new StringBuffer();
+
+LayoutGeneratorArguments argsBundle = (LayoutGeneratorArguments) argument;
+final GridLayoutData gmfLayoutData = (GridLayoutData)argsBundle.getFigure().getData();
+final String layoutConstraintVarName = argsBundle.getLayoutVariableName();
+
+ stringBuffer.append(TEXT_1);
+ stringBuffer.append(layoutConstraintVarName);
+ stringBuffer.append(TEXT_2);
+ stringBuffer.append(gmfLayoutData.getVerticalAlignment().getValue());
+ stringBuffer.append(TEXT_3);
+ stringBuffer.append(layoutConstraintVarName);
+ stringBuffer.append(TEXT_4);
+ stringBuffer.append(gmfLayoutData.getHorizontalAlignment().getValue());
+ stringBuffer.append(TEXT_5);
+
+Dimension sizeHint = gmfLayoutData.getSizeHint();
+if (sizeHint != null){
+
+ stringBuffer.append(TEXT_6);
+ stringBuffer.append(layoutConstraintVarName);
+ stringBuffer.append(TEXT_7);
+ stringBuffer.append(sizeHint.getDx());
+ stringBuffer.append(TEXT_8);
+ stringBuffer.append(layoutConstraintVarName);
+ stringBuffer.append(TEXT_9);
+ stringBuffer.append(sizeHint.getDy());
+ stringBuffer.append(TEXT_10);
+
+}
+
+ stringBuffer.append(TEXT_11);
+ stringBuffer.append(layoutConstraintVarName);
+ stringBuffer.append(TEXT_12);
+ stringBuffer.append(gmfLayoutData.getHorizontalIndent());
+ stringBuffer.append(TEXT_13);
+ stringBuffer.append(layoutConstraintVarName);
+ stringBuffer.append(TEXT_14);
+ stringBuffer.append(gmfLayoutData.getHorizontalSpan());
+ stringBuffer.append(TEXT_15);
+ stringBuffer.append(layoutConstraintVarName);
+ stringBuffer.append(TEXT_16);
+ stringBuffer.append(gmfLayoutData.getVerticalSpan());
+ stringBuffer.append(TEXT_17);
+ stringBuffer.append(layoutConstraintVarName);
+ stringBuffer.append(TEXT_18);
+ stringBuffer.append(gmfLayoutData.isGrabExcessHorizontalSpace());
+ stringBuffer.append(TEXT_19);
+ stringBuffer.append(layoutConstraintVarName);
+ stringBuffer.append(TEXT_20);
+ stringBuffer.append(gmfLayoutData.isGrabExcessVerticalSpace());
+ stringBuffer.append(TEXT_21);
+ stringBuffer.append(TEXT_22);
+ return stringBuffer.toString();
+ }
+}
Index: templates/layout/CustomLayout.javajet
===================================================================
RCS file: templates/layout/CustomLayout.javajet
diff -N templates/layout/CustomLayout.javajet
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ templates/layout/CustomLayout.javajet 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,9 @@
+<%@ jet package="org.eclipse.gmf.graphdef.codegen.templates" class="InitCustomLayoutDataGenerator"
+ imports="org.eclipse.gmf.gmfgraph.* org.eclipse.gmf.graphdef.codegen.*"%>
+<%
+final LayoutGeneratorArguments args = (LayoutGeneratorArguments) argument;
+final CustomLayoutData layoutData = (CustomLayoutData)args.getFigure().getData();
+final CustomClassArguments callArgs = new CustomClassArguments(layoutData, args.getLayoutVariableName());
+%>
+
+<%=args.getDispatcher().dispatch("customAttributes", callArgs)%>
Index: templates/layoutData/FigureMarker.javajet
===================================================================
RCS file: templates/layoutData/FigureMarker.javajet
diff -N templates/layoutData/FigureMarker.javajet
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ templates/layoutData/FigureMarker.javajet 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,25 @@
+<%@ jet package="org.eclipse.gmf.graphdef.codegen.templates" class="NewLayoutDataGenerator"
+ imports="org.eclipse.gmf.gmfgraph.* org.eclipse.gmf.graphdef.codegen.*"%>
+<%
+// NOTE: this code expects that constrainted figure is already added to its parent
+
+LayoutGeneratorArguments argsBundle = (LayoutGeneratorArguments) argument;
+final FigureMarker figureMarker = argsBundle.getFigure();
+final String figureVarName = argsBundle.getVariableName();
+final String layoutDataVarName = argsBundle.getLayoutVariableName();
+%>
+<%
+LayoutData gmfLayoutData = figureMarker.getData();
+if (gmfLayoutData != null){
+ String layoutImplClassName = argsBundle.getDispatcher().getImportManager().getImportedName(gmfLayoutData.getQualifiedClassName());
+%>
+
+ if (<%=figureVarName%>.getParent() != null && <%=figureVarName%>.getParent().getLayoutManager() != null) {
+ <%=layoutImplClassName%> <%=layoutDataVarName%> = new <%=layoutImplClassName%>();
+ <%=argsBundle.getDispatcher().dispatch(gmfLayoutData, argsBundle)%>
+ <%=figureVarName%>.getParent().getLayoutManager().setConstraint(<%=figureVarName%>, <%=layoutDataVarName%>);
+ }
+<%
+}
+%>
+
Index: src/org/eclipse/gmf/graphdef/codegen/templates/InitCustomLayoutDataGenerator.java
===================================================================
RCS file: src/org/eclipse/gmf/graphdef/codegen/templates/InitCustomLayoutDataGenerator.java
diff -N src/org/eclipse/gmf/graphdef/codegen/templates/InitCustomLayoutDataGenerator.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/graphdef/codegen/templates/InitCustomLayoutDataGenerator.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,36 @@
+package org.eclipse.gmf.graphdef.codegen.templates;
+
+import org.eclipse.gmf.gmfgraph.*;
+import org.eclipse.gmf.graphdef.codegen.*;
+
+public class InitCustomLayoutDataGenerator
+{
+ protected static String nl;
+ public static synchronized InitCustomLayoutDataGenerator create(String lineSeparator)
+ {
+ nl = lineSeparator;
+ InitCustomLayoutDataGenerator result = new InitCustomLayoutDataGenerator();
+ nl = null;
+ return result;
+ }
+
+ protected final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
+ protected final String TEXT_1 = "";
+ protected final String TEXT_2 = NL;
+ protected final String TEXT_3 = NL;
+
+ public String generate(Object argument)
+ {
+ StringBuffer stringBuffer = new StringBuffer();
+
+final LayoutGeneratorArguments args = (LayoutGeneratorArguments) argument;
+final CustomLayoutData layoutData = (CustomLayoutData)args.getFigure().getData();
+final CustomClassArguments callArgs = new CustomClassArguments(layoutData, args.getLayoutVariableName());
+
+ stringBuffer.append(TEXT_1);
+ stringBuffer.append(TEXT_2);
+ stringBuffer.append(args.getDispatcher().dispatch("customAttributes", callArgs));
+ stringBuffer.append(TEXT_3);
+ return stringBuffer.toString();
+ }
+}
Index: src/org/eclipse/gmf/graphdef/codegen/templates/InitBorderLayoutGenerator.java
===================================================================
RCS file: src/org/eclipse/gmf/graphdef/codegen/templates/InitBorderLayoutGenerator.java
diff -N src/org/eclipse/gmf/graphdef/codegen/templates/InitBorderLayoutGenerator.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/graphdef/codegen/templates/InitBorderLayoutGenerator.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,54 @@
+package org.eclipse.gmf.graphdef.codegen.templates;
+
+import org.eclipse.gmf.gmfgraph.*;
+import org.eclipse.gmf.graphdef.codegen.*;
+
+public class InitBorderLayoutGenerator
+{
+ protected static String nl;
+ public static synchronized InitBorderLayoutGenerator create(String lineSeparator)
+ {
+ nl = lineSeparator;
+ InitBorderLayoutGenerator result = new InitBorderLayoutGenerator();
+ nl = null;
+ return result;
+ }
+
+ 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 = ".setHorizontalSpacing(";
+ protected final String TEXT_4 = ");" + NL + "\t\t";
+ protected final String TEXT_5 = ".setVerticalSpacing(";
+ protected final String TEXT_6 = ");";
+ protected final String TEXT_7 = NL;
+
+ public String generate(Object argument)
+ {
+ StringBuffer stringBuffer = new StringBuffer();
+
+LayoutGeneratorArguments argsBundle = (LayoutGeneratorArguments) argument;
+final BorderLayout gmfLayout = (BorderLayout)argsBundle.getFigure().getLayout();
+final String layouterVarName = argsBundle.getLayoutVariableName();
+
+ stringBuffer.append(TEXT_1);
+
+Dimension spacing = gmfLayout.getSpacing();
+if (spacing != null){
+
+ stringBuffer.append(TEXT_2);
+ stringBuffer.append(layouterVarName);
+ stringBuffer.append(TEXT_3);
+ stringBuffer.append(spacing.getDx());
+ stringBuffer.append(TEXT_4);
+ stringBuffer.append(layouterVarName);
+ stringBuffer.append(TEXT_5);
+ stringBuffer.append(spacing.getDy());
+ stringBuffer.append(TEXT_6);
+
+}
+
+ stringBuffer.append(TEXT_7);
+ return stringBuffer.toString();
+ }
+}
#P org.eclipse.gmf.tests
Index: src/org/eclipse/gmf/tests/gen/FigureCodegenTest.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gen/FigureCodegenTest.java,v
retrieving revision 1.3
diff -u -r1.3 FigureCodegenTest.java
--- src/org/eclipse/gmf/tests/gen/FigureCodegenTest.java 6 Feb 2006 22:21:39 -0000 1.3
+++ src/org/eclipse/gmf/tests/gen/FigureCodegenTest.java 9 Feb 2006 18:41:53 -0000
@@ -11,38 +11,13 @@
*/
package org.eclipse.gmf.tests.gen;
-import junit.framework.TestCase;
-
-import org.eclipse.emf.codegen.jet.JETException;
-import org.eclipse.gmf.common.codegen.ImportUtil;
-import org.eclipse.gmf.gmfgraph.ConnectionFigure;
-import org.eclipse.gmf.gmfgraph.CustomFigure;
-import org.eclipse.gmf.gmfgraph.Ellipse;
-import org.eclipse.gmf.gmfgraph.Figure;
-import org.eclipse.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.gmf.gmfgraph.Label;
-import org.eclipse.gmf.gmfgraph.LineKind;
-import org.eclipse.gmf.gmfgraph.Point;
-import org.eclipse.gmf.gmfgraph.Polygon;
-import org.eclipse.gmf.gmfgraph.PolygonDecoration;
-import org.eclipse.gmf.gmfgraph.PolylineConnection;
-import org.eclipse.gmf.gmfgraph.Rectangle;
-import org.eclipse.gmf.gmfgraph.RoundedRectangle;
-import org.eclipse.gmf.gmfgraph.util.FigureQualifiedNameSwitch;
import org.eclipse.gmf.graphdef.codegen.FigureGenerator;
-import org.eclipse.jdt.core.compiler.IProblem;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.CompilationUnit;
/**
* TODO generate project, compile and instaniate figures to make sure values are set (like figure's bg/fg color)
* @author artem
*/
-public class FigureCodegenTest extends TestCase {
- private FigureGenerator figureGenerator;
-
+public class FigureCodegenTest extends FigureCodegenTestBase {
public FigureCodegenTest(String name) {
super(name);
}
@@ -64,126 +39,8 @@
}
public void testGenFigureWithoutPackageStmt() {
- figureGenerator = new FigureGenerator();
+ setCustomFigureGenerator(new FigureGenerator());
testGenComplexShape();
}
- private void performTests(Figure f) {
- try {
- String res = getGenerator().go(f);
- assertNotNull("Generation should produce code", res);
- ASTParser p = ASTParser.newParser(AST.JLS3);
- p.setSource(res.toCharArray());
- ASTNode astNode = p.createAST(null);
- assertEquals("Generator is expected to produce cu", astNode.getNodeType(), ASTNode.COMPILATION_UNIT);
- CompilationUnit cu = (CompilationUnit) astNode;
- if (getGenerator().getPackageStatement() != null) {
- assertNotNull("Generator initialized with packageName should produce package statement", cu.getPackage());
- assertEquals("Package names are different", getGenerator().getPackageStatement(), cu.getPackage().getName().getFullyQualifiedName());
- }
- IProblem[] problems = cu.getProblems();
- for (int i = 0; i < problems.length; i++) {
- assertFalse(problems[i].getMessage() + ", line:" + problems[i].getSourceLineNumber() + ", pos:" + cu.getColumnNumber(problems[i].getSourceStart()), problems[i].isError());
- }
- } catch (JETException ex) {
- fail(ex.getMessage());
- }
- }
-
- // custom top-level, hierarchical children.
- private Figure figure1() {
- CustomFigure cf = GMFGraphFactory.eINSTANCE.createCustomFigure();
- cf.setName("MyCylinder");
- cf.setBundleName("org.eclipse.gmf.runtime.geoshapes");
- cf.setQualifiedClassName("org.eclipse.gmf.runtime.geoshapes.internal.GeoShapeCylinder");
- Point p = GMFGraphFactory.eINSTANCE.createPoint();
- p.setX(1023);
- p.setY(33);
- cf.setSize(p);
- cf.getChildren().add(figure2());
- Ellipse e = GMFGraphFactory.eINSTANCE.createEllipse();
- e.setName("Elli");
- e.setFill(true);
- cf.getChildren().add(e);
- return cf;
- }
-
- // basic toplevel with plain list of children
- private Figure figure2() {
- Rectangle r = GMFGraphFactory.eINSTANCE.createRectangle();
- r.setName("MyRect");
- r.setFill(true);
- r.setLineWidth(3);
- r.setLineKind(LineKind.LINE_DASHDOT_LITERAL);
- Label l1 = GMFGraphFactory.eINSTANCE.createLabel();
- l1.setText("aaaaa");
- l1.setName("L1");
- Label l2 = GMFGraphFactory.eINSTANCE.createLabel();
- l2.setText("bbbbb");
- l2.setName("L2");
- r.getChildren().add(l1);
- r.getChildren().add(l2);
- return r;
- }
-
- // basic toplebel with hierarhical list of children (one of them is custom, another is polygon)
- private Figure figure3() {
- RoundedRectangle r = GMFGraphFactory.eINSTANCE.createRoundedRectangle();
- r.setName("Rounded1");
- Polygon pg = GMFGraphFactory.eINSTANCE.createPolygon();
- pg.setName("Polygon1");
- Point p = GMFGraphFactory.eINSTANCE.createPoint();
- p.setX(1);
- p.setY(2);
- pg.getTemplate().add(p);
- p = GMFGraphFactory.eINSTANCE.createPoint();
- p.setX(0);
- p.setY(3);
- pg.getTemplate().add(p);
- p = GMFGraphFactory.eINSTANCE.createPoint();
- p.setX(-2);
- p.setY(-1);
- pg.getTemplate().add(p);
- r.getChildren().add(pg);
- r.getChildren().add(figure1());
- return r;
- }
-
- private ConnectionFigure ecoreContainmentRef() {
- PolylineConnection cf = GMFGraphFactory.eINSTANCE.createPolylineConnection();
- cf.setName("ContainmentRef");
- PolygonDecoration df = createRhomb();
- df.setFill(true);
- cf.setSourceDecoration(df);
- return cf;
- }
-
- private PolygonDecoration createRhomb() {
- PolygonDecoration df = GMFGraphFactory.eINSTANCE.createPolygonDecoration();
- Point p = GMFGraphFactory.eINSTANCE.createPoint();
- p.setX(-1);
- p.setY(1);
- df.getTemplate().add(p);
- p = GMFGraphFactory.eINSTANCE.createPoint();
- p.setX(0);
- p.setY(0);
- df.getTemplate().add(p);
- p = GMFGraphFactory.eINSTANCE.createPoint();
- p.setX(-1);
- p.setY(-1);
- df.getTemplate().add(p);
- p = GMFGraphFactory.eINSTANCE.createPoint();
- p.setX(-2);
- p.setY(0);
- df.getTemplate().add(p);
- return df;
- }
-
- private FigureGenerator getGenerator() {
- if (figureGenerator == null) {
- String packageName = "org.eclipse.gmf.tests.sample.figures";
- figureGenerator = new FigureGenerator(packageName, new ImportUtil(packageName), new FigureQualifiedNameSwitch());
- }
- return figureGenerator;
- }
}
Index: src/org/eclipse/gmf/tests/gen/FigureLayoutTest.java
===================================================================
RCS file: src/org/eclipse/gmf/tests/gen/FigureLayoutTest.java
diff -N src/org/eclipse/gmf/tests/gen/FigureLayoutTest.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/tests/gen/FigureLayoutTest.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,291 @@
+package org.eclipse.gmf.tests.gen;
+
+import java.util.Arrays;
+import java.util.Iterator;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.gmf.gmfgraph.Alignment;
+import org.eclipse.gmf.gmfgraph.BorderLayout;
+import org.eclipse.gmf.gmfgraph.BorderLayoutData;
+import org.eclipse.gmf.gmfgraph.CustomAttribute;
+import org.eclipse.gmf.gmfgraph.CustomLayout;
+import org.eclipse.gmf.gmfgraph.Dimension;
+import org.eclipse.gmf.gmfgraph.Figure;
+import org.eclipse.gmf.gmfgraph.FigureMarker;
+import org.eclipse.gmf.gmfgraph.FigureRef;
+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.Rectangle;
+
+public class FigureLayoutTest extends FigureCodegenTestBase {
+ public FigureLayoutTest(String name){
+ super(name);
+ }
+
+ public void testConcreteShapeLayoutAllProperties(){
+ Figure parent = figure2();
+ EList children = parent.getChildren();
+ assertFalse("Precondition -- children required to test layout", children.isEmpty());
+
+ parent.setLayout(createGridLayoutAllProperties());
+
+ boolean oddChild = false;
+ for (Iterator it = children.iterator(); it.hasNext();){
+ FigureMarker next = (FigureMarker)it.next();
+ oddChild = !oddChild;
+ LayoutData data = createLayoutDataAllProperties(oddChild);
+ next.setData(data);
+ assertEquals("data-owner relation should be bidirectional", next, data.getOwner());
+ }
+ performTests(parent);
+ }
+
+// public void testLayoutIsStorable() throws IOException {
+// Figure parent = GMFGraphFactory.eINSTANCE.createRectangle();
+// parent.setName("Parent");
+// parent.setLayout(createLayoutAllProperties());
+//
+// Figure leftGreenFilled = GMFGraphFactory.eINSTANCE.createRectangle();
+// leftGreenFilled.setName("LeftGreen");
+// RGBColor green = GMFGraphFactory.eINSTANCE.createRGBColor();
+// green.setGreen(255);
+// leftGreenFilled.setBackgroundColor(green);
+// leftGreenFilled.setData(createLayoutDataAllProperties(true));
+//
+// Figure rightRedOutline = GMFGraphFactory.eINSTANCE.createRectangle();
+// rightRedOutline.setName("RightRed");
+// RGBColor red = GMFGraphFactory.eINSTANCE.createRGBColor();
+// red.setRed(255);
+// rightRedOutline.setForegroundColor(green);
+// rightRedOutline.setData(createLayoutDataAllProperties(false));
+//
+// Resource resource = new ResourceSetImpl().createResource(URI.createFileURI("C:/test-uri.xmi"));
+// resource.getContents().add(parent);
+// resource.save(null);
+// }
+
+ public void testCustomFigureLayoutAllProperties(){
+ Figure parent = figure1();
+ parent.setName("Parent");
+ GridLayout layout = createGridLayoutAllProperties();
+ layout.setNumColumns(1);
+ layout.setEqualWidth(false);
+ parent.setLayout(layout);
+
+ for (Iterator children = parent.getChildren().iterator(); children.hasNext();){
+ FigureMarker next = (FigureMarker)children.next();
+ GridLayoutData data = createLayoutDataAllProperties(false);
+ data.setHorizontalAlignment(Alignment.FILL_LITERAL);
+ data.setOwner(next);
+ assertEquals("data-owner relation should be bidirectional", data, next.getData());
+ }
+ performTests(parent);
+ }
+
+ public void testDeepChildrenLayout(){
+ Figure parent = GMFGraphFactory.eINSTANCE.createRectangle();
+ parent.setName("Root");
+
+ Figure next = parent;
+ for (int i = 0; i < 4; i++){
+ next = addPairOfChildRectnaglesAndReturnLeft(next);
+ }
+
+ performTests(parent);
+ }
+
+ public void testLayoutDefaults(){
+ Figure parent = GMFGraphFactory.eINSTANCE.createEllipse();
+ parent.setName("GenEllipse");
+ parent.setLayout(GMFGraphFactory.eINSTANCE.createGridLayout());
+
+ Figure top = GMFGraphFactory.eINSTANCE.createLabel();
+ top.setName("Top");
+ top.setData(GMFGraphFactory.eINSTANCE.createGridLayoutData());
+ parent.getChildren().add(top);
+
+ Figure bottom = GMFGraphFactory.eINSTANCE.createRoundedRectangle();
+ bottom.setName("Bottom");
+ bottom.setData(GMFGraphFactory.eINSTANCE.createGridLayoutData());
+ parent.getChildren().add(bottom);
+
+ performTests(parent);
+ }
+
+ public void testLayoutForReferencedChild(){
+ Figure actualContainer = figure2();
+ Figure referencedFigure = (Figure) actualContainer.getChildren().get(0);
+
+ Figure parent = GMFGraphFactory.eINSTANCE.createRectangle();
+ parent.setName("ReferencedFigureParent");
+ parent.setLayout(createGridLayoutAllProperties());
+
+ FigureRef refChildA = GMFGraphFactory.eINSTANCE.createFigureRef();
+ refChildA.setFigure(referencedFigure);
+ refChildA.setData(createLayoutDataAllProperties(false));
+
+ //same figure is referenced, different layout data
+ FigureRef refChildB = GMFGraphFactory.eINSTANCE.createFigureRef();
+ refChildB.setFigure(referencedFigure);
+ refChildB.setData(createLayoutDataAllProperties(true));
+
+ parent.getChildren().add(refChildA);
+ parent.getChildren().add(refChildB);
+
+ performTests(parent);
+ }
+
+ public void testMissedLayoutPresentLayoutData(){
+ Figure parent = GMFGraphFactory.eINSTANCE.createRectangle();
+ parent.setName("ParentWithoutLayout");
+ assertNull(parent.getLayout());
+
+ Figure child = GMFGraphFactory.eINSTANCE.createRectangle();
+ child.setName("childWithLayoutData");
+ child.setData(createLayoutDataAllProperties(false));
+
+ parent.getChildren().add(child);
+
+ performTests(parent);
+ }
+
+ public void testBorderLayout(){
+ Figure parent = GMFGraphFactory.eINSTANCE.createRectangle();
+ parent.setName("BorderedContents");
+
+ BorderLayout layout = GMFGraphFactory.eINSTANCE.createBorderLayout();
+ layout.setSpacing(createDimension(2, 4));
+ parent.setLayout(layout);
+
+ Figure centerA = GMFGraphFactory.eINSTANCE.createRoundedRectangle();
+ centerA.setName("Center_1");
+ centerA.setData(createLayoutData(Alignment.CENTER_LITERAL, false));
+
+ Figure centerB = GMFGraphFactory.eINSTANCE.createRoundedRectangle();
+ centerB.setName("Center_2");
+ centerB.setData(createLayoutData(Alignment.CENTER_LITERAL, true));
+
+ Figure left = GMFGraphFactory.eINSTANCE.createRoundedRectangle();
+ left.setName("Left");
+ left.setData(createLayoutData(Alignment.BEGINNING_LITERAL, false));
+
+ Figure right = GMFGraphFactory.eINSTANCE.createRoundedRectangle();
+ right.setName("Right");
+ right.setData(createLayoutData(Alignment.END_LITERAL, false));
+
+ Figure top = GMFGraphFactory.eINSTANCE.createRoundedRectangle();
+ top.setName("Top");
+ top.setData(createLayoutData(Alignment.BEGINNING_LITERAL, true));
+
+ Figure bottom = GMFGraphFactory.eINSTANCE.createRoundedRectangle();
+ bottom.setName("Bottom");
+ bottom.setData(createLayoutData(Alignment.END_LITERAL, true));
+
+ parent.getChildren().addAll(Arrays.asList(new Figure[] {top, bottom, left, right, centerA, centerB}));
+
+ performTests(parent);
+ }
+
+ public void testCustomLayout(){
+ CustomLayout layout = GMFGraphFactory.eINSTANCE.createCustomLayout();
+ layout.setQualifiedClassName("com.borland.layouts.TheBestLayoutManagerForever");
+
+ CustomAttribute normalAttr = GMFGraphFactory.eINSTANCE.createCustomAttribute();
+ normalAttr.setDirectAccess(false);
+ normalAttr.setMultiStatementValue(false);
+ normalAttr.setName("UnlimateAnswer");
+ normalAttr.setValue("42");
+
+ layout.getAttributes().add(normalAttr);
+
+ CustomAttribute directAttr = GMFGraphFactory.eINSTANCE.createCustomAttribute();
+ directAttr.setDirectAccess(true);
+ directAttr.setMultiStatementValue(false);
+ directAttr.setName("DirectUltimateAnswer");
+ directAttr.setValue("this.getUltimateAnswer() - 6 * 7");
+
+ layout.getAttributes().add(directAttr);
+
+ CustomAttribute multiAttr = GMFGraphFactory.eINSTANCE.createCustomAttribute();
+ multiAttr.setDirectAccess(false);
+ multiAttr.setMultiStatementValue(true);
+ multiAttr.setType("int");
+ multiAttr.setName("MultiStatementParameter");
+ multiAttr.setValue("if (Boolean.TRUE.booleanValue()) { %%% = 42; } else { %%% = -42; } ");
+
+ layout.getAttributes().add(multiAttr);
+
+ Figure parent = GMFGraphFactory.eINSTANCE.createRectangle();
+ parent.setName("CarefullyLayouted");
+ parent.setLayout(layout);
+
+ performTests(parent);
+ }
+
+ private Figure addPairOfChildRectnaglesAndReturnLeft(Figure parent){
+ GridLayout parentLayout = createGridLayoutAllProperties();
+ parentLayout.setNumColumns(2);
+ parentLayout.setMargins(null);
+ parentLayout.setSpacing(null);
+ parent.setLayout(parentLayout);
+
+ Rectangle left = GMFGraphFactory.eINSTANCE.createRectangle();
+ left.setName(parent.getName() + "_1");
+ left.setData(createLayoutDataAllProperties(true));
+ parent.getChildren().add(left);
+
+ Rectangle right = GMFGraphFactory.eINSTANCE.createRectangle();
+ right.setName(parent.getName() + "_2");
+ right.setData(createLayoutDataAllProperties(false));
+ parent.getChildren().add(right);
+
+ return left;
+ }
+
+ private GridLayoutData createLayoutDataAllProperties(boolean horizontalBeginningNotEnd) {
+ GridLayoutData data = GMFGraphFactory.eINSTANCE.createGridLayoutData();
+ data.setGrabExcessHorizontalSpace(true);
+ data.setGrabExcessVerticalSpace(false);
+ data.setHorizontalAlignment(horizontalBeginningNotEnd ? Alignment.BEGINNING_LITERAL : Alignment.END_LITERAL);
+ data.setVerticalAlignment(Alignment.CENTER_LITERAL);
+ data.setHorizontalIndent(5);
+ data.setHorizontalSpan(1);
+ data.setVerticalSpan(1);
+ return data;
+ }
+
+ private GridLayout createGridLayoutAllProperties() {
+ GridLayout layout = GMFGraphFactory.eINSTANCE.createGridLayout();
+ layout.setEqualWidth(true);
+ layout.setNumColumns(2);
+
+ Dimension margins = GMFGraphFactory.eINSTANCE.createDimension();
+ margins.setDx(5);
+ margins.setDy(10);
+ layout.setMargins(margins);
+
+ Dimension spacing = GMFGraphFactory.eINSTANCE.createDimension();
+ spacing.setDx(7);
+ spacing.setDy(8);
+ layout.setSpacing(spacing);
+
+ return layout;
+ }
+
+ private Dimension createDimension(int dx, int dy){
+ Dimension result = GMFGraphFactory.eINSTANCE.createDimension();
+ result.setDx(dx);
+ result.setDy(dy);
+ return result;
+ }
+
+ private BorderLayoutData createLayoutData(Alignment alignment, boolean isVertical){
+ BorderLayoutData result = GMFGraphFactory.eINSTANCE.createBorderLayoutData();
+ result.setAlignment(alignment);
+ result.setVertical(isVertical);
+ return result;
+ }
+
+}
Index: src/org/eclipse/gmf/tests/gen/FigureCodegenTestBase.java
===================================================================
RCS file: src/org/eclipse/gmf/tests/gen/FigureCodegenTestBase.java
diff -N src/org/eclipse/gmf/tests/gen/FigureCodegenTestBase.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/tests/gen/FigureCodegenTestBase.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2005 Borland Software Corporation
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Artem Tikhomirov (Borland) - initial API and implementation
+ */
+package org.eclipse.gmf.tests.gen;
+
+import junit.framework.TestCase;
+
+import org.eclipse.emf.codegen.jet.JETException;
+import org.eclipse.gmf.common.codegen.ImportUtil;
+import org.eclipse.gmf.gmfgraph.ConnectionFigure;
+import org.eclipse.gmf.gmfgraph.CustomFigure;
+import org.eclipse.gmf.gmfgraph.Ellipse;
+import org.eclipse.gmf.gmfgraph.Figure;
+import org.eclipse.gmf.gmfgraph.GMFGraphFactory;
+import org.eclipse.gmf.gmfgraph.Label;
+import org.eclipse.gmf.gmfgraph.LineKind;
+import org.eclipse.gmf.gmfgraph.Point;
+import org.eclipse.gmf.gmfgraph.Polygon;
+import org.eclipse.gmf.gmfgraph.PolygonDecoration;
+import org.eclipse.gmf.gmfgraph.PolylineConnection;
+import org.eclipse.gmf.gmfgraph.Rectangle;
+import org.eclipse.gmf.gmfgraph.RoundedRectangle;
+import org.eclipse.gmf.gmfgraph.util.FigureQualifiedNameSwitch;
+import org.eclipse.gmf.graphdef.codegen.FigureGenerator;
+import org.eclipse.jdt.core.compiler.IProblem;
+import org.eclipse.jdt.core.dom.AST;
+import org.eclipse.jdt.core.dom.ASTNode;
+import org.eclipse.jdt.core.dom.ASTParser;
+import org.eclipse.jdt.core.dom.CompilationUnit;
+
+/**
+ * TODO generate project, compile and instaniate figures to make sure values are set (like figure's bg/fg color)
+ * @author artem
+ */
+public class FigureCodegenTestBase extends TestCase {
+ private FigureGenerator figureGenerator;
+
+ public FigureCodegenTestBase(String name) {
+ super(name);
+ }
+
+ protected final void setCustomFigureGenerator(FigureGenerator generator){
+ figureGenerator = generator;
+ }
+
+ protected final void performTests(Figure f) {
+ try {
+ String res = getGenerator().go(f);
+
+ System.err.println("generator result:");
+ System.err.println(res);
+ System.err.println("--------------------------------");
+
+ assertNotNull("Generation should produce code", res);
+ ASTParser p = ASTParser.newParser(AST.JLS3);
+ p.setSource(res.toCharArray());
+ ASTNode astNode = p.createAST(null);
+ assertEquals("Generator is expected to produce cu", astNode.getNodeType(), ASTNode.COMPILATION_UNIT);
+ CompilationUnit cu = (CompilationUnit) astNode;
+ if (getGenerator().getPackageStatement() != null) {
+ assertNotNull("Generator initialized with packageName should produce package statement", cu.getPackage());
+ assertEquals("Package names are different", getGenerator().getPackageStatement(), cu.getPackage().getName().getFullyQualifiedName());
+ }
+ IProblem[] problems = cu.getProblems();
+ for (int i = 0; i < problems.length; i++) {
+ assertFalse(problems[i].getMessage() + ", line:" + problems[i].getSourceLineNumber() + ", pos:" + cu.getColumnNumber(problems[i].getSourceStart()), problems[i].isError());
+ }
+ } catch (JETException ex) {
+ fail(ex.getMessage());
+ }
+ }
+
+ // custom top-level, hierarchical children.
+ protected final Figure figure1() {
+ CustomFigure cf = GMFGraphFactory.eINSTANCE.createCustomFigure();
+ cf.setName("MyCylinder");
+ cf.setBundleName("org.eclipse.gmf.runtime.geoshapes");
+ cf.setQualifiedClassName("org.eclipse.gmf.runtime.geoshapes.internal.GeoShapeCylinder");
+ Point p = GMFGraphFactory.eINSTANCE.createPoint();
+ p.setX(1023);
+ p.setY(33);
+ cf.setSize(p);
+ cf.getChildren().add(figure2());
+ Ellipse e = GMFGraphFactory.eINSTANCE.createEllipse();
+ e.setName("Elli");
+ e.setFill(true);
+ cf.getChildren().add(e);
+ return cf;
+ }
+
+ // basic toplevel with plain list of children
+ protected final Figure figure2() {
+ Rectangle r = GMFGraphFactory.eINSTANCE.createRectangle();
+ r.setName("MyRect");
+ r.setFill(true);
+ r.setLineWidth(3);
+ r.setLineKind(LineKind.LINE_DASHDOT_LITERAL);
+ Label l1 = GMFGraphFactory.eINSTANCE.createLabel();
+ l1.setText("aaaaa");
+ l1.setName("L1");
+ Label l2 = GMFGraphFactory.eINSTANCE.createLabel();
+ l2.setText("bbbbb");
+ l2.setName("L2");
+ r.getChildren().add(l1);
+ r.getChildren().add(l2);
+ return r;
+ }
+
+ // basic toplebel with hierarhical list of children (one of them is custom, another is polygon)
+ protected final Figure figure3() {
+ RoundedRectangle r = GMFGraphFactory.eINSTANCE.createRoundedRectangle();
+ r.setName("Rounded1");
+ Polygon pg = GMFGraphFactory.eINSTANCE.createPolygon();
+ pg.setName("Polygon1");
+ Point p = GMFGraphFactory.eINSTANCE.createPoint();
+ p.setX(1);
+ p.setY(2);
+ pg.getTemplate().add(p);
+ p = GMFGraphFactory.eINSTANCE.createPoint();
+ p.setX(0);
+ p.setY(3);
+ pg.getTemplate().add(p);
+ p = GMFGraphFactory.eINSTANCE.createPoint();
+ p.setX(-2);
+ p.setY(-1);
+ pg.getTemplate().add(p);
+ r.getChildren().add(pg);
+ r.getChildren().add(figure1());
+ return r;
+ }
+
+ protected final ConnectionFigure ecoreContainmentRef() {
+ PolylineConnection cf = GMFGraphFactory.eINSTANCE.createPolylineConnection();
+ cf.setName("ContainmentRef");
+ PolygonDecoration df = createRhomb();
+ df.setFill(true);
+ cf.setSourceDecoration(df);
+ return cf;
+ }
+
+ protected final PolygonDecoration createRhomb() {
+ PolygonDecoration df = GMFGraphFactory.eINSTANCE.createPolygonDecoration();
+ Point p = GMFGraphFactory.eINSTANCE.createPoint();
+ p.setX(-1);
+ p.setY(1);
+ df.getTemplate().add(p);
+ p = GMFGraphFactory.eINSTANCE.createPoint();
+ p.setX(0);
+ p.setY(0);
+ df.getTemplate().add(p);
+ p = GMFGraphFactory.eINSTANCE.createPoint();
+ p.setX(-1);
+ p.setY(-1);
+ df.getTemplate().add(p);
+ p = GMFGraphFactory.eINSTANCE.createPoint();
+ p.setX(-2);
+ p.setY(0);
+ df.getTemplate().add(p);
+ return df;
+ }
+
+ private FigureGenerator getGenerator() {
+ if (figureGenerator == null) {
+ String packageName = "org.eclipse.gmf.tests.sample.figures";
+ figureGenerator = new FigureGenerator(packageName, new ImportUtil(packageName), new FigureQualifiedNameSwitch());
+ }
+ return figureGenerator;
+ }
+}
#P org.eclipse.gmf.codegen.ui
Index: META-INF/MANIFEST.MF
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.ui/META-INF/MANIFEST.MF,v
retrieving revision 1.12
diff -u -r1.12 MANIFEST.MF
--- META-INF/MANIFEST.MF 29 Jan 2006 16:16:19 -0000 1.12
+++ META-INF/MANIFEST.MF 9 Feb 2006 18:41:54 -0000
@@ -20,3 +20,4 @@
org.eclipse.gmf.runtime.emf.ui.properties
Eclipse-LazyStart: true
Bundle-Vendor: %providerName
+Export-Package: org.eclipse.gmf.internal.codegen.draw2d
Index: src/org/eclipse/gmf/internal/codegen/draw2d/GridDataAdapter.java
===================================================================
RCS file: src/org/eclipse/gmf/internal/codegen/draw2d/GridDataAdapter.java
diff -N src/org/eclipse/gmf/internal/codegen/draw2d/GridDataAdapter.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/internal/codegen/draw2d/GridDataAdapter.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,87 @@
+package org.eclipse.gmf.internal.codegen.draw2d;
+
+import org.eclipse.draw2d.geometry.Dimension;
+
+
+public class GridDataAdapter extends GridData {
+
+ public boolean isGrabExcessHorizontalSpace() {
+ return grabExcessHorizontalSpace;
+ }
+
+ public void setGrabExcessHorizontalSpace(boolean grabExcessHorizontalSpace) {
+ this.grabExcessHorizontalSpace = grabExcessHorizontalSpace;
+ }
+
+ public boolean isGrabExcessVerticalSpace() {
+ return grabExcessVerticalSpace;
+ }
+
+ public void setGrabExcessVerticalSpace(boolean grabExcessVerticalSpace) {
+ this.grabExcessVerticalSpace = grabExcessVerticalSpace;
+ }
+
+ public void setSizeHint(Dimension size){
+ if (size != null){
+ setWidthHint(size.width);
+ setHeightHint(size.height);
+ }
+ }
+
+ public int getWidthHint() {
+ return widthHint;
+ }
+
+ public void setWidthHint(int widthHint) {
+ this.widthHint = widthHint;
+ }
+
+ public int getHeightHint() {
+ return heightHint;
+ }
+
+ public void setHeightHint(int heightHint) {
+ this.heightHint = heightHint;
+ }
+
+ public int getHorizontalAlignment() {
+ return horizontalAlignment;
+ }
+
+ public void setHorizontalAlignment(int horizontalAlignment) {
+ this.horizontalAlignment = horizontalAlignment;
+ }
+
+ public int getHorizontalIndent() {
+ return horizontalIndent;
+ }
+
+ public void setHorizontalIndent(int horizontalIndent) {
+ this.horizontalIndent = horizontalIndent;
+ }
+
+ public int getHorizontalSpan() {
+ return horizontalSpan;
+ }
+
+ public void setHorizontalSpan(int horizontalSpan) {
+ this.horizontalSpan = horizontalSpan;
+ }
+
+ public int getVerticalAlignment() {
+ return verticalAlignment;
+ }
+
+ public void setVerticalAlignment(int verticalAlignment) {
+ this.verticalAlignment = verticalAlignment;
+ }
+
+ public int getVerticalSpan() {
+ return verticalSpan;
+ }
+
+ public void setVerticalSpan(int verticalSpan) {
+ this.verticalSpan = verticalSpan;
+ }
+
+}
Index: src/org/eclipse/gmf/internal/codegen/draw2d/GridData.java
===================================================================
RCS file: src/org/eclipse/gmf/internal/codegen/draw2d/GridData.java
diff -N src/org/eclipse/gmf/internal/codegen/draw2d/GridData.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/internal/codegen/draw2d/GridData.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,439 @@
+package org.eclipse.gmf.internal.codegen.draw2d;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.swt.SWT;
+
+
+/**
+ * GridData is the layout data object associated with
+ * GridLayout. To set a GridData object into a
+ * Figure, you use the setConstraint() method
+ * of GridLayout to map the Figure to its
+ * layout GridData.
+ *
+ * There are two ways to create a GridData object with certain
+ * fields set. The first is to set the fields directly, like this:
+ *
+ * GridData gridData = new GridData();
+ * gridData.horizontalAlignment = GridData.FILL;
+ * gridData.grabExcessHorizontalSpace = true;
+ *
+ * // associate the figure to the GridData object
+ * myGridlayout.setConstraint(myFigure, gridData);
+ *
+ * The second is to take advantage of convenience style bits defined
+ * by GridData:
+ *
+ * GridData gridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
+ *
+ *
+ *
+ * NOTE: Do not reuse GridData objects. Every child in the
+ * parent Figure that is managed by the GridLayout
+ * must have a unique GridData object. If the layout data
+ * for a Grid member in a GridLayout is null at layout time,
+ * a unique GridData object is created for it.
+ *
+ *
+ * @see GridLayout
+ */
+public class GridData {
+ /**
+ * verticalAlignment specifies how figures will be positioned
+ * vertically within a cell.
+ *
+ * The default value is CENTER.
+ *
+ * Possible values are:
+ *
+ * SWT.BEGINNING (or SWT.TOP): Position the figure at the top of the cell
+ * SWT.CENTER: Position the figure in the vertical center of the cell
+ * SWT.END (or SWT.BOTTOM): Position the figure at the bottom of the cell
+ * SWT.FILL: Resize the figure to fill the cell vertically
+ */
+ public int verticalAlignment = CENTER;
+
+ /**
+ * horizontalAlignment specifies how figures will be positioned
+ * horizontally within a cell.
+ *
+ * The default value is BEGINNING.
+ *
+ * Possible values are:
+ *
+ * SWT.BEGINNING (or SWT.LEFT): Position the figure at the left of the cell
+ * SWT.CENTER: Position the figure in the horizontal center of the cell
+ * SWT.END (or SWT.RIGHT): Position the figure at the right of the cell
+ * SWT.FILL: Resize the figure to fill the cell horizontally
+ */
+ public int horizontalAlignment = BEGINNING;
+
+ /**
+ * widthHint specifies a minimum width for the column. A value of
+ * SWT.DEFAULT indicates that no minimum width is specified.
+ *
+ * The default value is SWT.DEFAULT.
+ */
+ public int widthHint = SWT.DEFAULT;
+
+ /**
+ * heightHint specifies a minimum height for the row. A value of
+ * SWT.DEFAULT indicates that no minimum height is specified.
+ *
+ * The default value is SWT.DEFAULT.
+ */
+ public int heightHint = SWT.DEFAULT;
+
+ /**
+ * horizontalIndent specifies the number of pixels of indentation
+ * that will be placed along the left side of the cell.
+ *
+ * The default value is 0.
+ */
+ public int horizontalIndent = 0;
+
+ /**
+ * horizontalSpan specifies the number of column cells that the figure
+ * will take up.
+ *
+ * The default value is 1.
+ */
+ public int horizontalSpan = 1;
+
+ /**
+ * verticalSpan specifies the number of row cells that the figure
+ * will take up.
+ *
+ * The default value is 1.
+ */
+ public int verticalSpan = 1;
+
+ /**
+ * grabExcessHorizontalSpace specifies whether the cell will be made
+ * wide enough to fit the remaining horizontal space.
+ *
+ * The default value is false.
+ */
+ public boolean grabExcessHorizontalSpace = false;
+
+ /**
+ * grabExcessVerticalSpace specifies whether the cell will be made
+ * tall enough to fit the remaining vertical space.
+ *
+ * The default value is false.
+ */
+ public boolean grabExcessVerticalSpace = false;
+
+ /**
+ * Value for horizontalAlignment or verticalAlignment.
+ * Position the figure at the top or left of the cell.
+ * Not recommended. Use SWT.BEGINNING, SWT.TOP or SWT.LEFT instead.
+ */
+ public static final int BEGINNING = SWT.BEGINNING;
+
+ /**
+ * Value for horizontalAlignment or verticalAlignment.
+ * Position the figure in the vertical or horizontal center of the cell
+ * Not recommended. Use SWT.CENTER instead.
+ */
+ public static final int CENTER = 2;
+
+ /**
+ * Value for horizontalAlignment or verticalAlignment.
+ * Position the figure at the bottom or right of the cell
+ * Not recommended. Use SWT.END, SWT.BOTTOM or SWT.RIGHT instead.
+ */
+ public static final int END = 3;
+
+ /**
+ * Value for horizontalAlignment or verticalAlignment.
+ * Resize the figure to fill the cell horizontally or vertically.
+ * Not recommended. Use SWT.FILL instead.
+ */
+ public static final int FILL = SWT.FILL;
+
+ /**
+ * Style bit for new GridData(int).
+ * Position the figure at the top of the cell.
+ * Not recommended. Use
+ * new GridData(int, SWT.BEGINNING, boolean, boolean)
+ * instead.
+ */
+ public static final int VERTICAL_ALIGN_BEGINNING = 1 << 1;
+
+ /**
+ * Style bit for new GridData(int) to position the
+ * figure in the vertical center of the cell.
+ * Not recommended. Use
+ * new GridData(int, SWT.CENTER, boolean, boolean)
+ * instead.
+ */
+ public static final int VERTICAL_ALIGN_CENTER = 1 << 2;
+
+ /**
+ * Style bit for new GridData(int) to position the
+ * figure at the bottom of the cell.
+ * Not recommended. Use
+ * new GridData(int, SWT.END, boolean, boolean)
+ * instead.
+ */
+ public static final int VERTICAL_ALIGN_END = 1 << 3;
+
+ /**
+ * Style bit for new GridData(int) to resize the
+ * figure to fill the cell vertically.
+ * Not recommended. Use
+ * new GridData(int, SWT.FILL, boolean, boolean)
+ * instead
+ */
+ public static final int VERTICAL_ALIGN_FILL = 1 << 4;
+
+ /**
+ * Style bit for new GridData(int) to position the
+ * figure at the left of the cell.
+ * Not recommended. Use
+ * new GridData(SWT.BEGINNING, int, boolean, boolean)
+ * instead.
+ */
+ public static final int HORIZONTAL_ALIGN_BEGINNING = 1 << 5;
+
+ /**
+ * Style bit for new GridData(int) to position the
+ * figure in the horizontal center of the cell.
+ * Not recommended. Use
+ * new GridData(SWT.CENTER, int, boolean, boolean)
+ * instead.
+ */
+ public static final int HORIZONTAL_ALIGN_CENTER = 1 << 6;
+
+ /**
+ * Style bit for new GridData(int) to position the
+ * figure at the right of the cell.
+ * Not recommended. Use
+ * new GridData(SWT.END, int, boolean, boolean)
+ * instead.
+ */
+ public static final int HORIZONTAL_ALIGN_END = 1 << 7;
+
+ /**
+ * Style bit for new GridData(int) to resize the
+ * figure to fill the cell horizontally.
+ * Not recommended. Use
+ * new GridData(SWT.FILL, int, boolean, boolean)
+ * instead.
+ */
+ public static final int HORIZONTAL_ALIGN_FILL = 1 << 8;
+
+ /**
+ * Style bit for new GridData(int) to resize the
+ * figure to fit the remaining horizontal space.
+ * Not recommended. Use
+ * new GridData(int, int, true, boolean)
+ * instead.
+ */
+ public static final int GRAB_HORIZONTAL = 1 << 9;
+
+ /**
+ * Style bit for new GridData(int) to resize the
+ * figure to fit the remaining vertical space.
+ * Not recommended. Use
+ * new GridData(int, int, boolean, true)
+ * instead.
+ */
+ public static final int GRAB_VERTICAL = 1 << 10;
+
+ /**
+ * Style bit for new GridData(int) to resize the
+ * figure to fill the cell vertically and to fit the remaining
+ * vertical space.
+ * FILL_VERTICAL = VERTICAL_ALIGN_FILL | GRAB_VERTICAL
+ * Not recommended. Use
+ * new GridData(int, SWT.FILL, boolean, true)
+ * instead.
+ */
+ public static final int FILL_VERTICAL = VERTICAL_ALIGN_FILL | GRAB_VERTICAL;
+
+ /**
+ * Style bit for new GridData(int) to resize the
+ * figure to fill the cell horizontally and to fit the remaining
+ * horizontal space.
+ * FILL_HORIZONTAL = HORIZONTAL_ALIGN_FILL | GRAB_HORIZONTAL
+ * Not recommended. Use
+ * new GridData(SWT.FILL, int, true, boolean)
+ * instead.
+ */
+ public static final int FILL_HORIZONTAL = HORIZONTAL_ALIGN_FILL | GRAB_HORIZONTAL;
+
+ /**
+ * Style bit for new GridData(int) to resize the
+ * figure to fill the cell horizontally and vertically and
+ * to fit the remaining horizontal and vertical space.
+ * FILL_BOTH = FILL_VERTICAL | FILL_HORIZONTAL
+ * Not recommended. Use
+ * new GridData(SWT.FILL, SWT.FILL, true, true)
+ * instead.
+ */
+ public static final int FILL_BOTH = FILL_VERTICAL | FILL_HORIZONTAL;
+
+ int cacheWidth = -1, cacheHeight = -1;
+ int [][] cache = new int[2][4];
+ int cacheIndex = -1;
+
+/**
+ * Constructs a new instance of GridData using
+ * default values.
+ */
+public GridData () {
+ super ();
+}
+
+/**
+ * Constructs a new instance based on the GridData style.
+ * This constructor is not recommended.
+ *
+ * @param style the GridData style
+ */
+public GridData (int style) {
+ super ();
+ if ((style & VERTICAL_ALIGN_BEGINNING) != 0) verticalAlignment = BEGINNING;
+ if ((style & VERTICAL_ALIGN_CENTER) != 0) verticalAlignment = CENTER;
+ if ((style & VERTICAL_ALIGN_FILL) != 0) verticalAlignment = FILL;
+ if ((style & VERTICAL_ALIGN_END) != 0) verticalAlignment = END;
+ if ((style & HORIZONTAL_ALIGN_BEGINNING) != 0) horizontalAlignment = BEGINNING;
+ if ((style & HORIZONTAL_ALIGN_CENTER) != 0) horizontalAlignment = CENTER;
+ if ((style & HORIZONTAL_ALIGN_FILL) != 0) horizontalAlignment = FILL;
+ if ((style & HORIZONTAL_ALIGN_END) != 0) horizontalAlignment = END;
+ grabExcessHorizontalSpace = (style & GRAB_HORIZONTAL) != 0;
+ grabExcessVerticalSpace = (style & GRAB_VERTICAL) != 0;
+}
+
+/**
+ * Constructs a new instance of GridData according to the parameters.
+ *
+ * @param horizontalAlignment how figure will be positioned horizontally within a cell
+ * @param verticalAlignment how figure will be positioned vertically within a cell
+ * @param grabExcessHorizontalSpace whether cell will be made wide enough to fit the remaining horizontal space
+ * @param grabExcessVerticalSpace whether cell will be made high enough to fit the remaining vertical space
+ *
+ */
+public GridData (int horizontalAlignment, int verticalAlignment, boolean grabExcessHorizontalSpace, boolean grabExcessVerticalSpace) {
+ this (horizontalAlignment, verticalAlignment, grabExcessHorizontalSpace, grabExcessVerticalSpace, 1, 1);
+}
+
+/**
+ * Constructs a new instance of GridData according to the parameters.
+ *
+ * @param horizontalAlignment how figure will be positioned horizontally within a cell
+ * @param verticalAlignment how figure will be positioned vertically within a cell
+ * @param grabExcessHorizontalSpace whether cell will be made wide enough to fit the remaining horizontal space
+ * @param grabExcessVerticalSpace whether cell will be made high enough to fit the remaining vertical space
+ * @param horizontalSpan the number of column cells that the figure will take up
+ * @param verticalSpan the number of row cells that the figure will take up
+ *
+ */
+public GridData (int horizontalAlignment, int verticalAlignment, boolean grabExcessHorizontalSpace, boolean grabExcessVerticalSpace, int horizontalSpan, int verticalSpan) {
+ super ();
+ this.horizontalAlignment = horizontalAlignment;
+ this.verticalAlignment = verticalAlignment;
+ this.grabExcessHorizontalSpace = grabExcessHorizontalSpace;
+ this.grabExcessVerticalSpace = grabExcessVerticalSpace;
+ this.horizontalSpan = horizontalSpan;
+ this.verticalSpan = verticalSpan;
+}
+
+/**
+ * Constructs a new instance of GridData according to the parameters.
+ * A value of SWT.DEFAULT indicates that no minimum width or
+ * no minumum height is specified.
+ *
+ * @param width a minimum width for the column
+ * @param height a minimum height for the row
+ *
+ */
+public GridData (int width, int height) {
+ super ();
+ this.widthHint = width;
+ this.heightHint = height;
+}
+
+Dimension computeSize (IFigure figure, boolean flushCache) {
+ if (cacheWidth != -1 && cacheHeight != -1) {
+ return new Dimension (cacheWidth, cacheHeight);
+ }
+ for (int i = 0; i < cacheIndex + 1; i++) {
+ if (cache [i][0] == widthHint && cache [i][1] == heightHint) {
+ cacheWidth = cache [i][2];
+ cacheHeight = cache [i][3];
+ return new Dimension (cacheWidth, cacheHeight);
+ }
+ }
+
+ Dimension size = figure.getPreferredSize(widthHint,heightHint);
+ if (widthHint!=-1) size.width = widthHint;
+ if (heightHint!=-1) size.height = heightHint;
+
+ if (cacheIndex < cache.length - 1) cacheIndex++;
+ cache [cacheIndex][0] = widthHint;
+ cache [cacheIndex][1] = heightHint;
+ cacheWidth = cache [cacheIndex][2] = size.width;
+ cacheHeight = cache [cacheIndex][3] = size.height;
+ return size;
+}
+
+
+void flushCache () {
+ cacheWidth = cacheHeight = -1;
+ cacheIndex = -1;
+}
+
+String getName () {
+ String string = getClass ().getName ();
+ int index = string.lastIndexOf ('.');
+ if (index == -1) return string;
+ return string.substring (index + 1, string.length ());
+}
+
+public String toString () {
+
+ String hAlign = "";
+ switch (horizontalAlignment) {
+ case SWT.FILL: hAlign = "SWT.FILL"; break;
+ case SWT.BEGINNING: hAlign = "SWT.BEGINNING"; break;
+ case SWT.LEFT: hAlign = "SWT.LEFT"; break;
+ case SWT.END: hAlign = "SWT.END"; break;
+ case END: hAlign = "GridData.END"; break;
+ case SWT.RIGHT: hAlign = "SWT.RIGHT"; break;
+ case SWT.CENTER: hAlign = "SWT.CENTER"; break;
+ case CENTER: hAlign = "GridData.CENTER"; break;
+ default: hAlign = "Undefined "+horizontalAlignment; break;
+ }
+ String vAlign = "";
+ switch (verticalAlignment) {
+ case SWT.FILL: vAlign = "SWT.FILL"; break;
+ case SWT.BEGINNING: vAlign = "SWT.BEGINNING"; break;
+ case SWT.TOP: vAlign = "SWT.TOP"; break;
+ case SWT.END: vAlign = "SWT.END"; break;
+ case END: vAlign = "GridData.END"; break;
+ case SWT.BOTTOM: vAlign = "SWT.BOTTOM"; break;
+ case SWT.CENTER: vAlign = "SWT.CENTER"; break;
+ case CENTER: vAlign = "GridData.CENTER"; break;
+ default: vAlign = "Undefined "+verticalAlignment; break;
+ }
+ String string = getName()+" {";
+ string += "horizontalAlignment="+hAlign+" ";
+ if (horizontalIndent != 0) string += "horizontalIndent="+horizontalIndent+" ";
+ if (horizontalSpan != 1) string += "horizontalSpan="+horizontalSpan+" ";
+ if (grabExcessHorizontalSpace) string += "grabExcessHorizontalSpace="+grabExcessHorizontalSpace+" ";
+ if (widthHint != SWT.DEFAULT) string += "widthHint="+widthHint+" ";
+ string += "verticalAlignment="+vAlign+" ";
+ if (verticalSpan != 1) string += "verticalSpan="+verticalSpan+" ";
+ if (grabExcessVerticalSpace) string += "grabExcessVerticalSpace="+grabExcessVerticalSpace+" ";
+ if (heightHint != SWT.DEFAULT) string += "heightHint="+heightHint+" ";
+ string = string.trim();
+ string += "}";
+ return string;
+
+}
+
+}
Index: src/org/eclipse/gmf/internal/codegen/draw2d/GridLayoutAdapter.java
===================================================================
RCS file: src/org/eclipse/gmf/internal/codegen/draw2d/GridLayoutAdapter.java
diff -N src/org/eclipse/gmf/internal/codegen/draw2d/GridLayoutAdapter.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/internal/codegen/draw2d/GridLayoutAdapter.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,53 @@
+package org.eclipse.gmf.internal.codegen.draw2d;
+
+public class GridLayoutAdapter extends GridLayout {
+
+ public int getHorizontalSpacing() {
+ return horizontalSpacing;
+ }
+
+ public void setHorizontalSpacing(int horizontalSpacing) {
+ this.horizontalSpacing = horizontalSpacing;
+ }
+
+ public boolean isMakeColumnsEqualWidth() {
+ return makeColumnsEqualWidth;
+ }
+
+ public void setMakeColumnsEqualWidth(boolean makeColumnsEqualWidth) {
+ this.makeColumnsEqualWidth = makeColumnsEqualWidth;
+ }
+
+ public int getMarginHeight() {
+ return marginHeight;
+ }
+
+ public void setMarginHeight(int marginHeight) {
+ this.marginHeight = marginHeight;
+ }
+
+ public int getMarginWidth() {
+ return marginWidth;
+ }
+
+ public void setMarginWidth(int marginWidth) {
+ this.marginWidth = marginWidth;
+ }
+
+ public int getNumColumns() {
+ return numColumns;
+ }
+
+ public void setNumColumns(int numColumns) {
+ this.numColumns = numColumns;
+ }
+
+ public int getVerticalSpacing() {
+ return verticalSpacing;
+ }
+
+ public void setVerticalSpacing(int verticalSpacing) {
+ this.verticalSpacing = verticalSpacing;
+ }
+
+}
Index: src/org/eclipse/gmf/internal/codegen/draw2d/GridLayout.java
===================================================================
RCS file: src/org/eclipse/gmf/internal/codegen/draw2d/GridLayout.java
diff -N src/org/eclipse/gmf/internal/codegen/draw2d/GridLayout.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/internal/codegen/draw2d/GridLayout.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,794 @@
+package org.eclipse.gmf.internal.codegen.draw2d;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.draw2d.AbstractLayout;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.LayoutManager;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.swt.SWT;
+
+
+/**
+ * Lays out children into a Grid arrangement in which overall aligment and
+ * spacing can be configured, as well as specfic layout requirements for the
+ * each individual member of the GridLayout. This layout is a Draw2D port of the
+ * swt GridLayout.
+ *
+ * GridLayout has a number of configuration fields, and the
+ * Figures it lays out can have an associated layout data object, called
+ * GridData (similar to the swt GridData object). The power of
+ * GridLayout lies in the ability to configure
+ * GridData for each Figure in the layout.
+ *
+ * The following code creates a container Figure managed by a
+ * GridLayout with 2 columns, containing 3 RectangleFigure
+ * shapes, the last of which has been given further layout instructions.
+ * Note that it is the GridLayout method setConstraint
+ * that binds the child Figure to its layout GridData object.
+ *
+ *
+ * Figure container = new Figure();
+ * GridLayout gridLayout = new GridLayout();
+ * gridLayout.numColumns = 2;
+ * container.setLayout(gridLayout);
+ *
+ * Shape rect;
+ * rect = new RectangleFigure();
+ * container.add(rect);
+ *
+ * rect = new RectangleFigure();
+ * container.add(rect);
+ *
+ * rect = new RectangleFigure();
+ * GridData gridData = new GridData();
+ * gridData.widthHint = 150;
+ * layout.setConstraint(rect, gridData);
+ *
+ * container.add(rect);
+ *
+ *
+ *
+ * The numColumns field is the most important field in a
+ * GridLayout. Widgets are laid out in columns from left to
+ * right, and a new row is created when numColumns+ 1 figures
+ * are added to the Figure parent container.
+ *
+ * @see GridData
+ *
+ * @author Asim Ullah
+ * created: Sep 10, 2004
+ */
+public class GridLayout extends AbstractLayout {
+
+ /**
+ * numColumns specifies the number of cell columns in the layout.
+ *
+ * The default value is 1.
+ */
+ public int numColumns = 1;
+
+ /**
+ * makeColumnsEqualWidth specifies whether all columns in the layout will be
+ * forced to have the same width.
+ *
+ * The default value is false.
+ */
+ public boolean makeColumnsEqualWidth = false;
+
+ /**
+ * marginWidth specifies the number of pixels of horizontal margin that will
+ * be placed along the left and right edges of the layout.
+ *
+ * The default value is 5.
+ */
+ public int marginWidth = 5;
+
+ /**
+ * marginHeight specifies the number of pixels of vertical margin that will
+ * be placed along the top and bottom edges of the layout.
+ *
+ * The default value is 5.
+ */
+ public int marginHeight = 5;
+
+ /**
+ * horizontalSpacing specifies the number of pixels between the right edge
+ * of one cell and the left edge of its neighbouring cell to the right.
+ *
+ * The default value is 5.
+ */
+ public int horizontalSpacing = 5;
+
+ /**
+ * verticalSpacing specifies the number of pixels between the bottom edge of
+ * one cell and the top edge of its neighbouring cell underneath.
+ *
+ * The default value is 5.
+ */
+ public int verticalSpacing = 5;
+
+ /** The layout contraints */
+ protected Map constraints = new HashMap();
+
+ /**
+ * Default Constructor
+ */
+ public GridLayout() {
+ super();
+ }
+
+ /**
+ * Constructs a new instance of this class given the number of columns, and
+ * whether or not the columns should be forced to have the same width.
+ *
+ * @param numColumns
+ * the number of columns in the grid
+ * @param makeColumnsEqualWidth
+ * whether or not the columns will have equal width
+ *
+ */
+ public GridLayout(int numColumns, boolean makeColumnsEqualWidth) {
+ this.numColumns = numColumns;
+ this.makeColumnsEqualWidth = makeColumnsEqualWidth;
+ }
+
+ /**
+ * @param child
+ * @param wHint
+ * @param hHint
+ * @return
+ */
+ protected Dimension getChildSize(IFigure child, int wHint, int hHint) {
+ return child.getPreferredSize(wHint, hHint);
+ }
+
+ GridData getData(IFigure[][] grid, int row, int column, int rowCount,
+ int columnCount, boolean first) {
+ IFigure figure = grid[row][column];
+ if (figure != null) {
+ GridData data = (GridData) getConstraint(figure);
+ int hSpan = Math.max(1, Math.min(data.horizontalSpan, columnCount));
+ int vSpan = Math.max(1, data.verticalSpan);
+ int i = first ? row + vSpan - 1 : row - vSpan + 1;
+ int j = first ? column + hSpan - 1 : column - hSpan + 1;
+ if (0 <= i && i < rowCount) {
+ if (0 <= j && j < columnCount) {
+ if (figure == grid[i][j])
+ return data;
+ }
+ }
+ }
+ return null;
+ }
+
+ void initChildren(IFigure container)
+ {
+ List children = container.getChildren();
+ for (int i = 0; i < children.size(); i++) {
+ IFigure child = (IFigure) children.get(i);
+ if (child.getLayoutManager()==null)
+ child.setLayoutManager(this);
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.draw2d.AbstractLayout#calculatePreferredSize(org.eclipse.draw2d.IFigure,
+ * int, int)
+ */
+ protected Dimension calculatePreferredSize(IFigure container, int wHint,
+ int hHint) {
+ Dimension size = layout(container, false, 0, 0, wHint, hHint, /* flushCache */
+ true);
+ if (wHint != SWT.DEFAULT)
+ size.width = wHint;
+ if (hHint != SWT.DEFAULT)
+ size.height = hHint;
+
+ return size;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.draw2d.LayoutManager#layout(org.eclipse.draw2d.IFigure)
+ */
+ public void layout(IFigure container) {
+ //initChildren( container);
+ Rectangle rect = container.getClientArea();
+ layout(container, true, rect.x, rect.y, rect.width, rect.height, /* flushCache */
+ true);
+
+ }
+
+ Dimension layout(IFigure container, boolean move, int x, int y, int width,
+ int height, boolean flushCache) {
+ if (numColumns < 1)
+ return new Dimension(marginWidth * 2, marginHeight * 2);
+ List children = container.getChildren();
+ for (int i = 0; i < children.size(); i++) {
+ IFigure child = (IFigure) children.get(i);
+
+ GridData data = (GridData) getConstraint(child);
+ if (data == null)
+ setConstraint(child, data = new GridData());
+ if (flushCache)
+ data.flushCache();
+ data.computeSize(child, flushCache);
+ }
+
+ /* Build the grid */
+ int row = 0, column = 0, rowCount = 0, columnCount = numColumns;
+ IFigure[][] grid = new IFigure[4][columnCount];
+ for (int i = 0; i < children.size(); i++) {
+ IFigure child = (IFigure) children.get(i);
+ GridData data = (GridData) getConstraint(child);
+ int hSpan = Math.max(1, Math.min(data.horizontalSpan, columnCount));
+ int vSpan = Math.max(1, data.verticalSpan);
+ while (true) {
+ int lastRow = row + vSpan;
+ if (lastRow >= grid.length) {
+ IFigure[][] newGrid = new IFigure[lastRow + 4][columnCount];
+ System.arraycopy(grid, 0, newGrid, 0, grid.length);
+ grid = newGrid;
+ }
+ if (grid[row] == null) {
+ grid[row] = new IFigure[columnCount];
+ }
+ while (column < columnCount && grid[row][column] != null) {
+ column++;
+ }
+ int endCount = column + hSpan;
+ if (endCount <= columnCount) {
+ int index = column;
+ while (index < endCount && grid[row][index] == null) {
+ index++;
+ }
+ if (index == endCount)
+ break;
+ column = index;
+ }
+ if (column + hSpan >= columnCount) {
+ column = 0;
+ row++;
+ }
+ }
+ for (int j = 0; j < vSpan; j++) {
+ if (grid[row + j] == null) {
+ grid[row + j] = new IFigure[columnCount];
+ }
+ for (int k = 0; k < hSpan; k++) {
+ grid[row + j][column + k] = child;
+ }
+ }
+ rowCount = Math.max(rowCount, row + vSpan);
+ column += hSpan;
+ }
+
+ /* Column widths */
+ int availableWidth = width - horizontalSpacing * (columnCount - 1)
+ - marginWidth * 2;
+ int expandCount = 0;
+ int[] widths = new int[columnCount];
+ int[] minWidths = new int[columnCount];
+ boolean[] expandColumn = new boolean[columnCount];
+ for (int j = 0; j < columnCount; j++) {
+ for (int i = 0; i < rowCount; i++) {
+ GridData data = getData(grid, i, j, rowCount, columnCount, true);
+ if (data != null) {
+ int hSpan = Math.max(1, Math.min(data.horizontalSpan,
+ columnCount));
+ if (hSpan == 1) {
+ int w = data.cacheWidth + data.horizontalIndent;
+ widths[j] = Math.max(widths[j], w);
+ if (data.grabExcessHorizontalSpace) {
+ if (!expandColumn[j])
+ expandCount++;
+ expandColumn[j] = true;
+ }
+ if (data.widthHint != SWT.DEFAULT
+ || !data.grabExcessHorizontalSpace) {
+ minWidths[j] = Math.max(minWidths[j], w);
+ }
+ }
+ }
+ }
+ for (int i = 0; i < rowCount; i++) {
+ GridData data = getData(grid, i, j, rowCount, columnCount,
+ false);
+ if (data != null) {
+ int hSpan = Math.max(1, Math.min(data.horizontalSpan,
+ columnCount));
+ if (hSpan > 1) {
+ int spanWidth = 0, spanMinWidth = 0, spanExpandCount = 0;
+ for (int k = 0; k < hSpan; k++) {
+ spanWidth += widths[j - k];
+ spanMinWidth += minWidths[j - k];
+ if (expandColumn[j - k])
+ spanExpandCount++;
+ }
+ if (data.grabExcessHorizontalSpace
+ && spanExpandCount == 0) {
+ expandCount++;
+ expandColumn[j] = true;
+ }
+ int w = data.cacheWidth + data.horizontalIndent
+ - spanWidth - (hSpan - 1) * horizontalSpacing;
+ if (w > 0) {
+ if (spanExpandCount == 0) {
+ widths[j] += w;
+ } else {
+ int delta = w / spanExpandCount;
+ int remainder = w % spanExpandCount, last = -1;
+ for (int k = 0; k < hSpan; k++) {
+ if (expandColumn[j - k]) {
+ widths[last = j - k] += delta;
+ }
+ }
+ if (last > -1)
+ widths[last] += remainder;
+ }
+ }
+ if (data.widthHint != SWT.DEFAULT
+ || !data.grabExcessHorizontalSpace) {
+ w = data.cacheWidth + data.horizontalIndent
+ - spanMinWidth - (hSpan - 1)
+ * horizontalSpacing;
+ if (w > 0) {
+ if (spanExpandCount == 0) {
+ minWidths[j] += w;
+ } else {
+ int delta = w / spanExpandCount;
+ int remainder = w % spanExpandCount, last = -1;
+ for (int k = 0; k < hSpan; k++) {
+ if (expandColumn[j - k]) {
+ minWidths[last = j - k] += delta;
+ }
+ }
+ if (last > -1)
+ minWidths[last] += remainder;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ if (makeColumnsEqualWidth) {
+ int minColumnWidth = 0;
+ int columnWidth = 0;
+ for (int i = 0; i < columnCount; i++) {
+ minColumnWidth = Math.max(minColumnWidth, minWidths[i]);
+ columnWidth = Math.max(columnWidth, widths[i]);
+ }
+ columnWidth = width == SWT.DEFAULT || expandCount == 0
+ ? columnWidth
+ : Math.max(minColumnWidth, availableWidth / columnCount);
+ for (int i = 0; i < columnCount; i++) {
+ expandColumn[i] = expandCount > 0;
+ widths[i] = columnWidth;
+ }
+ } else {
+ if (width != SWT.DEFAULT && expandCount > 0) {
+ int totalWidth = 0;
+ for (int i = 0; i < columnCount; i++) {
+ totalWidth += widths[i];
+ }
+ int count = expandCount;
+ int delta = (availableWidth - totalWidth) / count;
+ int remainder = (availableWidth - totalWidth) % count;
+ int last = -1;
+ while (totalWidth != availableWidth) {
+ for (int j = 0; j < columnCount; j++) {
+ if (expandColumn[j]) {
+ if (widths[j] + delta > minWidths[j]) {
+ widths[last = j] = widths[j] + delta;
+ } else {
+ widths[j] = minWidths[j];
+ expandColumn[j] = false;
+ count--;
+ }
+ }
+ }
+ if (last > -1)
+ widths[last] += remainder;
+
+ for (int j = 0; j < columnCount; j++) {
+ for (int i = 0; i < rowCount; i++) {
+ GridData data = getData(grid, i, j, rowCount,
+ columnCount, false);
+ if (data != null) {
+ int hSpan = Math.max(1, Math.min(
+ data.horizontalSpan, columnCount));
+ if (hSpan > 1) {
+ if (data.widthHint != SWT.DEFAULT
+ || !data.grabExcessHorizontalSpace) {
+ int spanWidth = 0, spanExpandCount = 0;
+ for (int k = 0; k < hSpan; k++) {
+ spanWidth += widths[j - k];
+ if (expandColumn[j - k])
+ spanExpandCount++;
+ }
+ int w = data.cacheWidth
+ + data.horizontalIndent
+ - spanWidth - (hSpan - 1)
+ * horizontalSpacing;
+ if (w > 0) {
+ if (spanExpandCount == 0) {
+ widths[j] += w;
+ } else {
+ int delta2 = w
+ / spanExpandCount;
+ int remainder2 = w
+ % spanExpandCount, last2 = -1;
+ for (int k = 0; k < hSpan; k++) {
+ if (expandColumn[j - k]) {
+ widths[last2 = j - k] += delta2;
+ }
+ }
+ if (last2 > -1)
+ widths[last2] += remainder2;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ if (count == 0)
+ break;
+ totalWidth = 0;
+ for (int i = 0; i < columnCount; i++) {
+ totalWidth += widths[i];
+ }
+ delta = (availableWidth - totalWidth) / count;
+ remainder = (availableWidth - totalWidth) % count;
+ last = -1;
+ }
+ }
+ }
+
+ /* Wrapping */
+ GridData[] flush = null;
+ int flushLength = 0;
+ if (width != SWT.DEFAULT) {
+ for (int j = 0; j < columnCount; j++) {
+ for (int i = 0; i < rowCount; i++) {
+ GridData data = getData(grid, i, j, rowCount, columnCount,
+ false);
+ if (data != null) {
+ if (data.heightHint == SWT.DEFAULT) {
+ IFigure child = grid[i][j];
+ //TEMPORARY CODE
+ int hSpan = Math.max(1, Math.min(
+ data.horizontalSpan, columnCount));
+ int currentWidth = 0;
+ for (int k = 0; k < hSpan; k++) {
+ currentWidth += widths[j - k];
+ }
+ currentWidth += (hSpan - 1) * horizontalSpacing
+ - data.horizontalIndent;
+ if ((currentWidth != data.cacheWidth && data.horizontalAlignment == SWT.FILL)
+ || (data.cacheWidth > currentWidth)) {
+ int trim = 0;
+ /*
+ // *Note*: Left this in place from SWT
+ // GridLayout. Not sure if Draw2D Borders or
+ // Scrollbars 'trim' will need to be takeninto account.
+
+ if (child instanceof Group) {
+ Group g =(Group)child; trim = g.getSize ().x -
+ g.getClientArea ().width;
+ } else if (child instanceof Scrollable) {
+ Rectangle rect =
+ ((Scrollable) child).computeTrim (0, 0, 0,0);
+ trim = rect.width; }
+ else {
+ trim = child.getBorderWidth () * 2;
+ }
+ */
+ int oldWidthHint = data.widthHint;
+ data.widthHint = Math.max(0, currentWidth
+ - trim);
+ data.cacheWidth = data.cacheHeight = SWT.DEFAULT;
+ data.computeSize(child, false);
+ data.widthHint = oldWidthHint;
+ if (flush == null)
+ flush = new GridData[children.size()];
+ flush[flushLength++] = data;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /* Row heights */
+ int availableHeight = height - verticalSpacing * (rowCount - 1)
+ - marginHeight * 2;
+ expandCount = 0;
+ int[] heights = new int[rowCount];
+ int[] minHeights = new int[rowCount];
+ boolean[] expandRow = new boolean[rowCount];
+ for (int i = 0; i < rowCount; i++) {
+ for (int j = 0; j < columnCount; j++) {
+ GridData data = getData(grid, i, j, rowCount, columnCount, true);
+ if (data != null) {
+ int vSpan = Math.max(1, Math.min(data.verticalSpan,
+ rowCount));
+ if (vSpan == 1) {
+ int h = data.cacheHeight; // + data.verticalIndent;
+ heights[i] = Math.max(heights[i], h);
+ if (data.grabExcessVerticalSpace) {
+ if (!expandRow[i])
+ expandCount++;
+ expandRow[i] = true;
+ }
+ if (data.heightHint != SWT.DEFAULT
+ || !data.grabExcessVerticalSpace) {
+ minHeights[i] = Math.max(minHeights[i], h);
+ }
+ }
+ }
+ }
+ for (int j = 0; j < columnCount; j++) {
+ GridData data = getData(grid, i, j, rowCount, columnCount,
+ false);
+ if (data != null) {
+ int vSpan = Math.max(1, Math.min(data.verticalSpan,
+ rowCount));
+ if (vSpan > 1) {
+ int spanHeight = 0, spanMinHeight = 0, spanExpandCount = 0;
+ for (int k = 0; k < vSpan; k++) {
+ spanHeight += heights[i - k];
+ spanMinHeight += minHeights[i - k];
+ if (expandRow[i - k])
+ spanExpandCount++;
+ }
+ if (data.grabExcessVerticalSpace
+ && spanExpandCount == 0) {
+ expandCount++;
+ expandRow[i] = true;
+ }
+ int h = data.cacheHeight - spanHeight - (vSpan - 1)
+ * verticalSpacing; // + data.verticalalIndent
+ if (h > 0) {
+ if (spanExpandCount == 0) {
+ heights[i] += h;
+ } else {
+ int delta = h / spanExpandCount;
+ int remainder = h % spanExpandCount, last = -1;
+ for (int k = 0; k < vSpan; k++) {
+ if (expandRow[i - k]) {
+ heights[last = i - k] += delta;
+ }
+ }
+ if (last > -1)
+ heights[last] += remainder;
+ }
+ }
+ if (data.heightHint != SWT.DEFAULT
+ || !data.grabExcessVerticalSpace) {
+ h = data.cacheHeight - spanMinHeight - (vSpan - 1)
+ * verticalSpacing; // + data.verticalIndent
+ if (h > 0) {
+ if (spanExpandCount == 0) {
+ minHeights[i] += h;
+ } else {
+ int delta = h / spanExpandCount;
+ int remainder = h % spanExpandCount, last = -1;
+ for (int k = 0; k < vSpan; k++) {
+ if (expandRow[i - k]) {
+ minHeights[last = i - k] += delta;
+ }
+ }
+ if (last > -1)
+ minHeights[last] += remainder;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ if (height != SWT.DEFAULT && expandCount > 0) {
+ int totalHeight = 0;
+ for (int i = 0; i < rowCount; i++) {
+ totalHeight += heights[i];
+ }
+ int count = expandCount;
+ int delta = (availableHeight - totalHeight) / count;
+ int remainder = (availableHeight - totalHeight) % count;
+ int last = -1;
+ while (totalHeight != availableHeight) {
+ for (int i = 0; i < rowCount; i++) {
+ if (expandRow[i]) {
+ if (heights[i] + delta > minHeights[i]) {
+ heights[last = i] = heights[i] + delta;
+ } else {
+ heights[i] = minHeights[i];
+ expandRow[i] = false;
+ count--;
+ }
+ }
+ }
+ if (last > -1)
+ heights[last] += remainder;
+
+ for (int i = 0; i < rowCount; i++) {
+ for (int j = 0; j < columnCount; j++) {
+ GridData data = getData(grid, i, j, rowCount,
+ columnCount, false);
+ if (data != null) {
+ int vSpan = Math.max(1, Math.min(data.verticalSpan,
+ rowCount));
+ if (vSpan > 1) {
+ if (data.heightHint != SWT.DEFAULT
+ || !data.grabExcessVerticalSpace) {
+ int spanHeight = 0, spanExpandCount = 0;
+ for (int k = 0; k < vSpan; k++) {
+ spanHeight += heights[i - k];
+ if (expandRow[i - k])
+ spanExpandCount++;
+ }
+ int h = data.cacheHeight - spanHeight
+ - (vSpan - 1) * verticalSpacing; // +
+ // data.verticalIndent
+ if (h > 0) {
+ if (spanExpandCount == 0) {
+ heights[i] += h;
+ } else {
+ int delta2 = h / spanExpandCount;
+ int remainder2 = h
+ % spanExpandCount, last2 = -1;
+ for (int k = 0; k < vSpan; k++) {
+ if (expandRow[i - k]) {
+ heights[last2 = i - k] += delta2;
+ }
+ }
+ if (last2 > -1)
+ heights[last2] += remainder2;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ if (count == 0)
+ break;
+ totalHeight = 0;
+ for (int i = 0; i < rowCount; i++) {
+ totalHeight += heights[i];
+ }
+ delta = (availableHeight - totalHeight) / count;
+ remainder = (availableHeight - totalHeight) % count;
+ last = -1;
+ }
+ }
+
+ /* Position the IFigures */
+ if (move) {
+ int gridY = y + marginHeight;
+ for (int i = 0; i < rowCount; i++) {
+ int gridX = x + marginWidth;
+ for (int j = 0; j < columnCount; j++) {
+ GridData data = getData(grid, i, j, rowCount, columnCount,
+ true);
+ if (data != null) {
+ int hSpan = Math.max(1, Math.min(data.horizontalSpan,
+ columnCount));
+ int vSpan = Math.max(1, data.verticalSpan);
+ int cellWidth = 0, cellHeight = 0;
+ for (int k = 0; k < hSpan; k++) {
+ cellWidth += widths[j + k];
+ }
+ for (int k = 0; k < vSpan; k++) {
+ cellHeight += heights[i + k];
+ }
+ cellWidth += horizontalSpacing * (hSpan - 1);
+ int childX = gridX + data.horizontalIndent;
+ int childWidth = Math.min(data.cacheWidth, cellWidth);
+ switch (data.horizontalAlignment) {
+ case SWT.CENTER :
+ case GridData.CENTER :
+ childX = gridX
+ + Math.max(0,
+ (cellWidth - childWidth) / 2);
+ break;
+ case SWT.RIGHT :
+ case SWT.END :
+ case GridData.END :
+ childX = gridX
+ + Math.max(0, cellWidth - childWidth);
+ break;
+ case SWT.FILL :
+ childWidth = cellWidth - data.horizontalIndent;
+ break;
+ }
+ cellHeight += verticalSpacing * (vSpan - 1);
+ int childY = gridY; // + data.verticalIndent;
+ int childHeight = Math
+ .min(data.cacheHeight, cellHeight);
+ switch (data.verticalAlignment) {
+ case SWT.CENTER :
+ case GridData.CENTER :
+ childY = gridY
+ + Math.max(0,
+ (cellHeight - childHeight) / 2);
+ break;
+ case SWT.BOTTOM :
+ case SWT.END :
+ case GridData.END :
+ childY = gridY
+ + Math.max(0, cellHeight - childHeight);
+ break;
+ case SWT.FILL :
+ childHeight = cellHeight; // -
+ // data.verticalIndent;
+ break;
+ }
+ IFigure child = grid[i][j];
+ if (child != null) {
+ // following param could be replaced by
+ // Rectangle.SINGLETON
+ child.setBounds(new Rectangle(childX, childY,
+ childWidth, childHeight));
+ }
+ }
+ gridX += widths[j] + horizontalSpacing;
+ }
+ gridY += heights[i] + verticalSpacing;
+ }
+ }
+
+ // clean up cache
+ for (int i = 0; i < flushLength; i++) {
+ flush[i].cacheWidth = flush[i].cacheHeight = -1;
+ }
+
+ int totalDefaultWidth = 0;
+ int totalDefaultHeight = 0;
+ for (int i = 0; i < columnCount; i++) {
+ totalDefaultWidth += widths[i];
+ }
+ for (int i = 0; i < rowCount; i++) {
+ totalDefaultHeight += heights[i];
+ }
+ totalDefaultWidth += horizontalSpacing * (columnCount - 1)
+ + marginWidth * 2;
+ totalDefaultHeight += verticalSpacing * (rowCount - 1) + marginHeight
+ * 2;
+ return new Dimension(totalDefaultWidth, totalDefaultHeight);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.draw2d.LayoutManager#getConstraint(org.eclipse.draw2d.IFigure)
+ */
+ public Object getConstraint(IFigure child) {
+ return constraints.get(child);
+ }
+
+ /**
+ * Sets the layout constraint of the given figure. The constraints can only
+ * be of type {@link GridData}.
+ *
+ * @see LayoutManager#setConstraint(IFigure, Object)
+ */
+ public void setConstraint(IFigure figure, Object newConstraint) {
+ super.setConstraint(figure, newConstraint);
+ if (newConstraint != null)
+ {
+ constraints.put(figure, newConstraint);
+
+ }
+ }
+
+}