Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratikhomirov2006-11-02 22:50:22 +0000
committeratikhomirov2006-11-02 22:50:22 +0000
commita687ccb1390eabf1f4c8bb8fc957240fb1cf90f0 (patch)
tree93f1113de95c39f188b37032dd0bb43cf6c66030
parent6687a924c8d20863d2a3acc0d34836811a27e9d7 (diff)
downloadorg.eclipse.gmf-tooling-a687ccb1390eabf1f4c8bb8fc957240fb1cf90f0.tar.gz
org.eclipse.gmf-tooling-a687ccb1390eabf1f4c8bb8fc957240fb1cf90f0.tar.xz
org.eclipse.gmf-tooling-a687ccb1390eabf1f4c8bb8fc957240fb1cf90f0.zip
reverted explicit EObject superclass in the metamodel since it's not being utilized in new templates
-rw-r--r--plugins/org.eclipse.gmf.graphdef/models/gmfgraph.ecore20
-rw-r--r--plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/Figure.java4
-rw-r--r--plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/GMFGraphPackage.java80
-rw-r--r--plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/CustomFigureImpl.java27
-rw-r--r--plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/GMFGraphPackageImpl.java10
-rw-r--r--plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/LabelImpl.java27
-rw-r--r--plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/LabeledContainerImpl.java27
-rw-r--r--plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/ShapeImpl.java27
8 files changed, 50 insertions, 172 deletions
diff --git a/plugins/org.eclipse.gmf.graphdef/models/gmfgraph.ecore b/plugins/org.eclipse.gmf.graphdef/models/gmfgraph.ecore
index a8f9667ed..26373d08f 100644
--- a/plugins/org.eclipse.gmf.graphdef/models/gmfgraph.ecore
+++ b/plugins/org.eclipse.gmf.graphdef/models/gmfgraph.ecore
@@ -120,7 +120,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="referencingElements" upperBound="-1"
eType="#//DiagramElement" eOpposite="#//DiagramElement/figure"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Figure" interface="true" eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EObject #//FigureMarker #//FigureHandle #//Identity">
+ <eClassifiers xsi:type="ecore:EClass" name="Figure" interface="true" eSuperTypes="#//FigureMarker #//FigureHandle #//Identity">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="org.eclipse.draw2d.Figure"/>
</eAnnotations>
@@ -249,7 +249,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="attributes" upperBound="-1"
eType="#//CustomAttribute" containment="true"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="CustomAttribute" eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EObject">
+ <eClassifiers xsi:type="ecore:EClass" name="CustomAttribute">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
defaultValueLiteral="null"/>
@@ -280,7 +280,7 @@
<details key="documentation" value="Same as CustomFigure, but for Connections"/>
</eAnnotations>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Color" interface="true" eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Color" interface="true"/>
<eClassifiers xsi:type="ecore:EClass" name="RGBColor" eSuperTypes="#//Color">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="red" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="green" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
@@ -306,7 +306,7 @@
<eLiterals name="blue" value="13"/>
<eLiterals name="darkBlue" value="14"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Font" interface="true" eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Font" interface="true"/>
<eClassifiers xsi:type="ecore:EClass" name="BasicFont" eSuperTypes="#//Font">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="faceName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="height" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
@@ -319,21 +319,21 @@
<eLiterals name="BOLD" value="1"/>
<eLiterals name="ITALIC" value="2"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Point" eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EObject">
+ <eClassifiers xsi:type="ecore:EClass" name="Point">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="x" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="y" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Dimension" eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EObject">
+ <eClassifiers xsi:type="ecore:EClass" name="Dimension">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="dx" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="dy" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Insets" eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EObject">
+ <eClassifiers xsi:type="ecore:EClass" name="Insets">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="top" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="left" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="bottom" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="right" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Border" interface="true" eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Border" interface="true"/>
<eClassifiers xsi:type="ecore:EClass" name="LineBorder" eSuperTypes="#//Border">
<eStructuralFeatures xsi:type="ecore:EReference" name="color" eType="#//Color"
containment="true"/>
@@ -379,7 +379,7 @@
<eLiterals name="LINE_DASHDOTDOT" value="5"/>
<eLiterals name="LINE_CUSTOM" value="6"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="LayoutData" interface="true" eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EObject">
+ <eClassifiers xsi:type="ecore:EClass" name="LayoutData" interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="owner" lowerBound="1" eType="#//Layoutable"
eOpposite="#//Layoutable/layoutData"/>
</eClassifiers>
@@ -422,7 +422,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="layout" eType="#//Layout"
containment="true"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Layout" interface="true" eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Layout" interface="true"/>
<eClassifiers xsi:type="ecore:EClass" name="CustomLayout" eSuperTypes="#//Layout #//CustomClass"/>
<eClassifiers xsi:type="ecore:EClass" name="GridLayout" eSuperTypes="#//Layout">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="numColumns" lowerBound="1"
diff --git a/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/Figure.java b/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/Figure.java
index 23ebb218e..7c5f93321 100644
--- a/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/Figure.java
+++ b/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/Figure.java
@@ -8,8 +8,6 @@ package org.eclipse.gmf.gmfgraph;
import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Figure</b></em>'.
@@ -40,7 +38,7 @@ import org.eclipse.emf.ecore.EObject;
* @model interface="true" abstract="true"
* @generated
*/
-public interface Figure extends EObject, FigureMarker, FigureHandle, Identity {
+public interface Figure extends FigureMarker, FigureHandle, Identity {
/**
* Returns the value of the '<em><b>Children</b></em>' containment reference list.
* The list contents are of type {@link org.eclipse.gmf.gmfgraph.FigureMarker}.
diff --git a/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/GMFGraphPackage.java b/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/GMFGraphPackage.java
index fa0946f51..2ba2357e0 100644
--- a/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/GMFGraphPackage.java
+++ b/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/GMFGraphPackage.java
@@ -12,8 +12,6 @@ import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-
/**
* <!-- begin-user-doc -->
* The <b>Package</b> for the model.
@@ -834,7 +832,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int FIGURE__LAYOUT_DATA = EcorePackage.EOBJECT_FEATURE_COUNT + 0;
+ int FIGURE__LAYOUT_DATA = FIGURE_MARKER__LAYOUT_DATA;
/**
* The feature id for the '<em><b>Layout</b></em>' containment reference.
@@ -843,7 +841,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int FIGURE__LAYOUT = EcorePackage.EOBJECT_FEATURE_COUNT + 1;
+ int FIGURE__LAYOUT = FIGURE_MARKER__LAYOUT;
/**
* The feature id for the '<em><b>Parent</b></em>' container reference.
@@ -852,7 +850,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int FIGURE__PARENT = EcorePackage.EOBJECT_FEATURE_COUNT + 2;
+ int FIGURE__PARENT = FIGURE_MARKER__PARENT;
/**
* The feature id for the '<em><b>Referencing Elements</b></em>' reference list.
@@ -861,7 +859,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int FIGURE__REFERENCING_ELEMENTS = EcorePackage.EOBJECT_FEATURE_COUNT + 3;
+ int FIGURE__REFERENCING_ELEMENTS = FIGURE_MARKER_FEATURE_COUNT + 0;
/**
* The feature id for the '<em><b>Name</b></em>' attribute.
@@ -870,7 +868,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int FIGURE__NAME = EcorePackage.EOBJECT_FEATURE_COUNT + 4;
+ int FIGURE__NAME = FIGURE_MARKER_FEATURE_COUNT + 1;
/**
* The feature id for the '<em><b>Children</b></em>' containment reference list.
@@ -879,7 +877,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int FIGURE__CHILDREN = EcorePackage.EOBJECT_FEATURE_COUNT + 5;
+ int FIGURE__CHILDREN = FIGURE_MARKER_FEATURE_COUNT + 2;
/**
* The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
@@ -888,7 +886,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int FIGURE__FOREGROUND_COLOR = EcorePackage.EOBJECT_FEATURE_COUNT + 6;
+ int FIGURE__FOREGROUND_COLOR = FIGURE_MARKER_FEATURE_COUNT + 3;
/**
* The feature id for the '<em><b>Background Color</b></em>' containment reference.
@@ -897,7 +895,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int FIGURE__BACKGROUND_COLOR = EcorePackage.EOBJECT_FEATURE_COUNT + 7;
+ int FIGURE__BACKGROUND_COLOR = FIGURE_MARKER_FEATURE_COUNT + 4;
/**
* The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
@@ -906,7 +904,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int FIGURE__MAXIMUM_SIZE = EcorePackage.EOBJECT_FEATURE_COUNT + 8;
+ int FIGURE__MAXIMUM_SIZE = FIGURE_MARKER_FEATURE_COUNT + 5;
/**
* The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
@@ -915,7 +913,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int FIGURE__MINIMUM_SIZE = EcorePackage.EOBJECT_FEATURE_COUNT + 9;
+ int FIGURE__MINIMUM_SIZE = FIGURE_MARKER_FEATURE_COUNT + 6;
/**
* The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
@@ -924,7 +922,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int FIGURE__PREFERRED_SIZE = EcorePackage.EOBJECT_FEATURE_COUNT + 10;
+ int FIGURE__PREFERRED_SIZE = FIGURE_MARKER_FEATURE_COUNT + 7;
/**
* The feature id for the '<em><b>Font</b></em>' containment reference.
@@ -933,7 +931,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int FIGURE__FONT = EcorePackage.EOBJECT_FEATURE_COUNT + 11;
+ int FIGURE__FONT = FIGURE_MARKER_FEATURE_COUNT + 8;
/**
* The feature id for the '<em><b>Insets</b></em>' containment reference.
@@ -942,7 +940,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int FIGURE__INSETS = EcorePackage.EOBJECT_FEATURE_COUNT + 12;
+ int FIGURE__INSETS = FIGURE_MARKER_FEATURE_COUNT + 9;
/**
* The feature id for the '<em><b>Border</b></em>' containment reference.
@@ -951,7 +949,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int FIGURE__BORDER = EcorePackage.EOBJECT_FEATURE_COUNT + 13;
+ int FIGURE__BORDER = FIGURE_MARKER_FEATURE_COUNT + 10;
/**
* The feature id for the '<em><b>Location</b></em>' containment reference.
@@ -960,7 +958,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int FIGURE__LOCATION = EcorePackage.EOBJECT_FEATURE_COUNT + 14;
+ int FIGURE__LOCATION = FIGURE_MARKER_FEATURE_COUNT + 11;
/**
* The feature id for the '<em><b>Size</b></em>' containment reference.
@@ -969,7 +967,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int FIGURE__SIZE = EcorePackage.EOBJECT_FEATURE_COUNT + 15;
+ int FIGURE__SIZE = FIGURE_MARKER_FEATURE_COUNT + 12;
/**
* The number of structural features of the '<em>Figure</em>' class.
@@ -978,7 +976,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int FIGURE_FEATURE_COUNT = EcorePackage.EOBJECT_FEATURE_COUNT + 16;
+ int FIGURE_FEATURE_COUNT = FIGURE_MARKER_FEATURE_COUNT + 13;
/**
* The meta object id for the '{@link org.eclipse.gmf.gmfgraph.impl.FigureRefImpl <em>Figure Ref</em>}' class.
@@ -4359,7 +4357,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int CUSTOM_ATTRIBUTE__NAME = EcorePackage.EOBJECT_FEATURE_COUNT + 0;
+ int CUSTOM_ATTRIBUTE__NAME = 0;
/**
* The feature id for the '<em><b>Value</b></em>' attribute.
@@ -4368,7 +4366,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int CUSTOM_ATTRIBUTE__VALUE = EcorePackage.EOBJECT_FEATURE_COUNT + 1;
+ int CUSTOM_ATTRIBUTE__VALUE = 1;
/**
* The feature id for the '<em><b>Direct Access</b></em>' attribute.
@@ -4377,7 +4375,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int CUSTOM_ATTRIBUTE__DIRECT_ACCESS = EcorePackage.EOBJECT_FEATURE_COUNT + 2;
+ int CUSTOM_ATTRIBUTE__DIRECT_ACCESS = 2;
/**
* The feature id for the '<em><b>Multi Statement Value</b></em>' attribute.
@@ -4386,7 +4384,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int CUSTOM_ATTRIBUTE__MULTI_STATEMENT_VALUE = EcorePackage.EOBJECT_FEATURE_COUNT + 3;
+ int CUSTOM_ATTRIBUTE__MULTI_STATEMENT_VALUE = 3;
/**
* The number of structural features of the '<em>Custom Attribute</em>' class.
@@ -4395,7 +4393,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int CUSTOM_ATTRIBUTE_FEATURE_COUNT = EcorePackage.EOBJECT_FEATURE_COUNT + 4;
+ int CUSTOM_ATTRIBUTE_FEATURE_COUNT = 4;
/**
* The meta object id for the '{@link org.eclipse.gmf.gmfgraph.impl.FigureAccessorImpl <em>Figure Accessor</em>}' class.
@@ -5017,7 +5015,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int COLOR_FEATURE_COUNT = EcorePackage.EOBJECT_FEATURE_COUNT + 0;
+ int COLOR_FEATURE_COUNT = 0;
/**
* The feature id for the '<em><b>Red</b></em>' attribute.
@@ -5080,7 +5078,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int FONT_FEATURE_COUNT = EcorePackage.EOBJECT_FEATURE_COUNT + 0;
+ int FONT_FEATURE_COUNT = 0;
/**
* The feature id for the '<em><b>Face Name</b></em>' attribute.
@@ -5125,7 +5123,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int POINT__X = EcorePackage.EOBJECT_FEATURE_COUNT + 0;
+ int POINT__X = 0;
/**
* The feature id for the '<em><b>Y</b></em>' attribute.
@@ -5134,7 +5132,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int POINT__Y = EcorePackage.EOBJECT_FEATURE_COUNT + 1;
+ int POINT__Y = 1;
/**
* The number of structural features of the '<em>Point</em>' class.
@@ -5143,7 +5141,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int POINT_FEATURE_COUNT = EcorePackage.EOBJECT_FEATURE_COUNT + 2;
+ int POINT_FEATURE_COUNT = 2;
/**
* The feature id for the '<em><b>Dx</b></em>' attribute.
@@ -5152,7 +5150,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int DIMENSION__DX = EcorePackage.EOBJECT_FEATURE_COUNT + 0;
+ int DIMENSION__DX = 0;
/**
* The feature id for the '<em><b>Dy</b></em>' attribute.
@@ -5161,7 +5159,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int DIMENSION__DY = EcorePackage.EOBJECT_FEATURE_COUNT + 1;
+ int DIMENSION__DY = 1;
/**
* The number of structural features of the '<em>Dimension</em>' class.
@@ -5170,7 +5168,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int DIMENSION_FEATURE_COUNT = EcorePackage.EOBJECT_FEATURE_COUNT + 2;
+ int DIMENSION_FEATURE_COUNT = 2;
/**
* The feature id for the '<em><b>Top</b></em>' attribute.
@@ -5179,7 +5177,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int INSETS__TOP = EcorePackage.EOBJECT_FEATURE_COUNT + 0;
+ int INSETS__TOP = 0;
/**
* The feature id for the '<em><b>Left</b></em>' attribute.
@@ -5188,7 +5186,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int INSETS__LEFT = EcorePackage.EOBJECT_FEATURE_COUNT + 1;
+ int INSETS__LEFT = 1;
/**
* The feature id for the '<em><b>Bottom</b></em>' attribute.
@@ -5197,7 +5195,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int INSETS__BOTTOM = EcorePackage.EOBJECT_FEATURE_COUNT + 2;
+ int INSETS__BOTTOM = 2;
/**
* The feature id for the '<em><b>Right</b></em>' attribute.
@@ -5206,7 +5204,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int INSETS__RIGHT = EcorePackage.EOBJECT_FEATURE_COUNT + 3;
+ int INSETS__RIGHT = 3;
/**
* The number of structural features of the '<em>Insets</em>' class.
@@ -5215,7 +5213,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int INSETS_FEATURE_COUNT = EcorePackage.EOBJECT_FEATURE_COUNT + 4;
+ int INSETS_FEATURE_COUNT = 4;
/**
* The number of structural features of the '<em>Border</em>' class.
@@ -5224,7 +5222,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int BORDER_FEATURE_COUNT = EcorePackage.EOBJECT_FEATURE_COUNT + 0;
+ int BORDER_FEATURE_COUNT = 0;
/**
* The feature id for the '<em><b>Color</b></em>' containment reference.
@@ -5341,7 +5339,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int LAYOUT_DATA__OWNER = EcorePackage.EOBJECT_FEATURE_COUNT + 0;
+ int LAYOUT_DATA__OWNER = 0;
/**
* The number of structural features of the '<em>Layout Data</em>' class.
@@ -5350,7 +5348,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int LAYOUT_DATA_FEATURE_COUNT = EcorePackage.EOBJECT_FEATURE_COUNT + 1;
+ int LAYOUT_DATA_FEATURE_COUNT = 1;
/**
* The feature id for the '<em><b>Owner</b></em>' container reference.
@@ -5530,7 +5528,7 @@ public interface GMFGraphPackage extends EPackage {
* @generated
* @ordered
*/
- int LAYOUT_FEATURE_COUNT = EcorePackage.EOBJECT_FEATURE_COUNT + 0;
+ int LAYOUT_FEATURE_COUNT = 0;
/**
* The feature id for the '<em><b>Qualified Class Name</b></em>' attribute.
diff --git a/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/CustomFigureImpl.java b/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/CustomFigureImpl.java
index 0363ed906..f0b408846 100644
--- a/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/CustomFigureImpl.java
+++ b/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/CustomFigureImpl.java
@@ -36,7 +36,6 @@ import org.eclipse.gmf.gmfgraph.Identity;
import org.eclipse.gmf.gmfgraph.Insets;
import org.eclipse.gmf.gmfgraph.Layout;
import org.eclipse.gmf.gmfgraph.LayoutData;
-import org.eclipse.gmf.gmfgraph.Layoutable;
import org.eclipse.gmf.gmfgraph.Point;
/**
@@ -1276,19 +1275,6 @@ public class CustomFigureImpl extends EObjectImpl implements CustomFigure {
* @generated
*/
public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
- if (baseClass == Layoutable.class) {
- switch (derivedFeatureID) {
- case GMFGraphPackage.CUSTOM_FIGURE__LAYOUT_DATA: return GMFGraphPackage.LAYOUTABLE__LAYOUT_DATA;
- case GMFGraphPackage.CUSTOM_FIGURE__LAYOUT: return GMFGraphPackage.LAYOUTABLE__LAYOUT;
- default: return -1;
- }
- }
- if (baseClass == FigureMarker.class) {
- switch (derivedFeatureID) {
- case GMFGraphPackage.CUSTOM_FIGURE__PARENT: return GMFGraphPackage.FIGURE_MARKER__PARENT;
- default: return -1;
- }
- }
if (baseClass == FigureHandle.class) {
switch (derivedFeatureID) {
case GMFGraphPackage.CUSTOM_FIGURE__REFERENCING_ELEMENTS: return GMFGraphPackage.FIGURE_HANDLE__REFERENCING_ELEMENTS;
@@ -1318,19 +1304,6 @@ public class CustomFigureImpl extends EObjectImpl implements CustomFigure {
* @generated
*/
public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
- if (baseClass == Layoutable.class) {
- switch (baseFeatureID) {
- case GMFGraphPackage.LAYOUTABLE__LAYOUT_DATA: return GMFGraphPackage.CUSTOM_FIGURE__LAYOUT_DATA;
- case GMFGraphPackage.LAYOUTABLE__LAYOUT: return GMFGraphPackage.CUSTOM_FIGURE__LAYOUT;
- default: return -1;
- }
- }
- if (baseClass == FigureMarker.class) {
- switch (baseFeatureID) {
- case GMFGraphPackage.FIGURE_MARKER__PARENT: return GMFGraphPackage.CUSTOM_FIGURE__PARENT;
- default: return -1;
- }
- }
if (baseClass == FigureHandle.class) {
switch (baseFeatureID) {
case GMFGraphPackage.FIGURE_HANDLE__REFERENCING_ELEMENTS: return GMFGraphPackage.CUSTOM_FIGURE__REFERENCING_ELEMENTS;
diff --git a/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/GMFGraphPackageImpl.java b/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/GMFGraphPackageImpl.java
index 1095f575d..ae5e6d95a 100644
--- a/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/GMFGraphPackageImpl.java
+++ b/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/GMFGraphPackageImpl.java
@@ -2545,7 +2545,6 @@ public class GMFGraphPackageImpl extends EPackageImpl implements GMFGraphPackage
labelOffsetFacetEClass.getESuperTypes().add(this.getVisualFacet());
defaultSizeFacetEClass.getESuperTypes().add(this.getVisualFacet());
figureMarkerEClass.getESuperTypes().add(this.getLayoutable());
- figureEClass.getESuperTypes().add(ecorePackage.getEObject());
figureEClass.getESuperTypes().add(this.getFigureMarker());
figureEClass.getESuperTypes().add(this.getFigureHandle());
figureEClass.getESuperTypes().add(this.getIdentity());
@@ -2567,7 +2566,6 @@ public class GMFGraphPackageImpl extends EPackageImpl implements GMFGraphPackage
polylineDecorationEClass.getESuperTypes().add(this.getDecorationFigure());
polygonDecorationEClass.getESuperTypes().add(this.getPolygon());
polygonDecorationEClass.getESuperTypes().add(this.getDecorationFigure());
- customAttributeEClass.getESuperTypes().add(ecorePackage.getEObject());
figureAccessorEClass.getESuperTypes().add(this.getFigureHandle());
customFigureEClass.getESuperTypes().add(this.getFigure());
customFigureEClass.getESuperTypes().add(this.getCustomClass());
@@ -2575,26 +2573,18 @@ public class GMFGraphPackageImpl extends EPackageImpl implements GMFGraphPackage
customDecorationEClass.getESuperTypes().add(this.getDecorationFigure());
customConnectionEClass.getESuperTypes().add(this.getCustomFigure());
customConnectionEClass.getESuperTypes().add(this.getConnectionFigure());
- colorEClass.getESuperTypes().add(ecorePackage.getEObject());
rgbColorEClass.getESuperTypes().add(this.getColor());
constantColorEClass.getESuperTypes().add(this.getColor());
- fontEClass.getESuperTypes().add(ecorePackage.getEObject());
basicFontEClass.getESuperTypes().add(this.getFont());
- pointEClass.getESuperTypes().add(ecorePackage.getEObject());
- dimensionEClass.getESuperTypes().add(ecorePackage.getEObject());
- insetsEClass.getESuperTypes().add(ecorePackage.getEObject());
- borderEClass.getESuperTypes().add(ecorePackage.getEObject());
lineBorderEClass.getESuperTypes().add(this.getBorder());
marginBorderEClass.getESuperTypes().add(this.getBorder());
compoundBorderEClass.getESuperTypes().add(this.getBorder());
customBorderEClass.getESuperTypes().add(this.getBorder());
customBorderEClass.getESuperTypes().add(this.getCustomClass());
- layoutDataEClass.getESuperTypes().add(ecorePackage.getEObject());
customLayoutDataEClass.getESuperTypes().add(this.getLayoutData());
customLayoutDataEClass.getESuperTypes().add(this.getCustomClass());
gridLayoutDataEClass.getESuperTypes().add(this.getLayoutData());
borderLayoutDataEClass.getESuperTypes().add(this.getLayoutData());
- layoutEClass.getESuperTypes().add(ecorePackage.getEObject());
customLayoutEClass.getESuperTypes().add(this.getLayout());
customLayoutEClass.getESuperTypes().add(this.getCustomClass());
gridLayoutEClass.getESuperTypes().add(this.getLayout());
diff --git a/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/LabelImpl.java b/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/LabelImpl.java
index d071c5846..10e96d0cd 100644
--- a/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/LabelImpl.java
+++ b/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/LabelImpl.java
@@ -32,7 +32,6 @@ import org.eclipse.gmf.gmfgraph.Insets;
import org.eclipse.gmf.gmfgraph.Label;
import org.eclipse.gmf.gmfgraph.Layout;
import org.eclipse.gmf.gmfgraph.LayoutData;
-import org.eclipse.gmf.gmfgraph.Layoutable;
import org.eclipse.gmf.gmfgraph.Point;
/**
@@ -1148,19 +1147,6 @@ public class LabelImpl extends EObjectImpl implements Label {
* @generated
*/
public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
- if (baseClass == Layoutable.class) {
- switch (derivedFeatureID) {
- case GMFGraphPackage.LABEL__LAYOUT_DATA: return GMFGraphPackage.LAYOUTABLE__LAYOUT_DATA;
- case GMFGraphPackage.LABEL__LAYOUT: return GMFGraphPackage.LAYOUTABLE__LAYOUT;
- default: return -1;
- }
- }
- if (baseClass == FigureMarker.class) {
- switch (derivedFeatureID) {
- case GMFGraphPackage.LABEL__PARENT: return GMFGraphPackage.FIGURE_MARKER__PARENT;
- default: return -1;
- }
- }
if (baseClass == FigureHandle.class) {
switch (derivedFeatureID) {
case GMFGraphPackage.LABEL__REFERENCING_ELEMENTS: return GMFGraphPackage.FIGURE_HANDLE__REFERENCING_ELEMENTS;
@@ -1182,19 +1168,6 @@ public class LabelImpl extends EObjectImpl implements Label {
* @generated
*/
public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
- if (baseClass == Layoutable.class) {
- switch (baseFeatureID) {
- case GMFGraphPackage.LAYOUTABLE__LAYOUT_DATA: return GMFGraphPackage.LABEL__LAYOUT_DATA;
- case GMFGraphPackage.LAYOUTABLE__LAYOUT: return GMFGraphPackage.LABEL__LAYOUT;
- default: return -1;
- }
- }
- if (baseClass == FigureMarker.class) {
- switch (baseFeatureID) {
- case GMFGraphPackage.FIGURE_MARKER__PARENT: return GMFGraphPackage.LABEL__PARENT;
- default: return -1;
- }
- }
if (baseClass == FigureHandle.class) {
switch (baseFeatureID) {
case GMFGraphPackage.FIGURE_HANDLE__REFERENCING_ELEMENTS: return GMFGraphPackage.LABEL__REFERENCING_ELEMENTS;
diff --git a/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/LabeledContainerImpl.java b/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/LabeledContainerImpl.java
index 323db8155..702742dc4 100644
--- a/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/LabeledContainerImpl.java
+++ b/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/LabeledContainerImpl.java
@@ -32,7 +32,6 @@ import org.eclipse.gmf.gmfgraph.Insets;
import org.eclipse.gmf.gmfgraph.LabeledContainer;
import org.eclipse.gmf.gmfgraph.Layout;
import org.eclipse.gmf.gmfgraph.LayoutData;
-import org.eclipse.gmf.gmfgraph.Layoutable;
import org.eclipse.gmf.gmfgraph.Point;
/**
@@ -1096,19 +1095,6 @@ public class LabeledContainerImpl extends EObjectImpl implements LabeledContaine
* @generated
*/
public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
- if (baseClass == Layoutable.class) {
- switch (derivedFeatureID) {
- case GMFGraphPackage.LABELED_CONTAINER__LAYOUT_DATA: return GMFGraphPackage.LAYOUTABLE__LAYOUT_DATA;
- case GMFGraphPackage.LABELED_CONTAINER__LAYOUT: return GMFGraphPackage.LAYOUTABLE__LAYOUT;
- default: return -1;
- }
- }
- if (baseClass == FigureMarker.class) {
- switch (derivedFeatureID) {
- case GMFGraphPackage.LABELED_CONTAINER__PARENT: return GMFGraphPackage.FIGURE_MARKER__PARENT;
- default: return -1;
- }
- }
if (baseClass == FigureHandle.class) {
switch (derivedFeatureID) {
case GMFGraphPackage.LABELED_CONTAINER__REFERENCING_ELEMENTS: return GMFGraphPackage.FIGURE_HANDLE__REFERENCING_ELEMENTS;
@@ -1130,19 +1116,6 @@ public class LabeledContainerImpl extends EObjectImpl implements LabeledContaine
* @generated
*/
public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
- if (baseClass == Layoutable.class) {
- switch (baseFeatureID) {
- case GMFGraphPackage.LAYOUTABLE__LAYOUT_DATA: return GMFGraphPackage.LABELED_CONTAINER__LAYOUT_DATA;
- case GMFGraphPackage.LAYOUTABLE__LAYOUT: return GMFGraphPackage.LABELED_CONTAINER__LAYOUT;
- default: return -1;
- }
- }
- if (baseClass == FigureMarker.class) {
- switch (baseFeatureID) {
- case GMFGraphPackage.FIGURE_MARKER__PARENT: return GMFGraphPackage.LABELED_CONTAINER__PARENT;
- default: return -1;
- }
- }
if (baseClass == FigureHandle.class) {
switch (baseFeatureID) {
case GMFGraphPackage.FIGURE_HANDLE__REFERENCING_ELEMENTS: return GMFGraphPackage.LABELED_CONTAINER__REFERENCING_ELEMENTS;
diff --git a/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/ShapeImpl.java b/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/ShapeImpl.java
index 210a6cfb9..7775889ea 100644
--- a/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/ShapeImpl.java
+++ b/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/impl/ShapeImpl.java
@@ -35,7 +35,6 @@ import org.eclipse.gmf.gmfgraph.Identity;
import org.eclipse.gmf.gmfgraph.Insets;
import org.eclipse.gmf.gmfgraph.Layout;
import org.eclipse.gmf.gmfgraph.LayoutData;
-import org.eclipse.gmf.gmfgraph.Layoutable;
import org.eclipse.gmf.gmfgraph.LineKind;
import org.eclipse.gmf.gmfgraph.Point;
import org.eclipse.gmf.gmfgraph.Shape;
@@ -1437,19 +1436,6 @@ public abstract class ShapeImpl extends EObjectImpl implements Shape {
* @generated
*/
public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
- if (baseClass == Layoutable.class) {
- switch (derivedFeatureID) {
- case GMFGraphPackage.SHAPE__LAYOUT_DATA: return GMFGraphPackage.LAYOUTABLE__LAYOUT_DATA;
- case GMFGraphPackage.SHAPE__LAYOUT: return GMFGraphPackage.LAYOUTABLE__LAYOUT;
- default: return -1;
- }
- }
- if (baseClass == FigureMarker.class) {
- switch (derivedFeatureID) {
- case GMFGraphPackage.SHAPE__PARENT: return GMFGraphPackage.FIGURE_MARKER__PARENT;
- default: return -1;
- }
- }
if (baseClass == FigureHandle.class) {
switch (derivedFeatureID) {
case GMFGraphPackage.SHAPE__REFERENCING_ELEMENTS: return GMFGraphPackage.FIGURE_HANDLE__REFERENCING_ELEMENTS;
@@ -1471,19 +1457,6 @@ public abstract class ShapeImpl extends EObjectImpl implements Shape {
* @generated
*/
public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
- if (baseClass == Layoutable.class) {
- switch (baseFeatureID) {
- case GMFGraphPackage.LAYOUTABLE__LAYOUT_DATA: return GMFGraphPackage.SHAPE__LAYOUT_DATA;
- case GMFGraphPackage.LAYOUTABLE__LAYOUT: return GMFGraphPackage.SHAPE__LAYOUT;
- default: return -1;
- }
- }
- if (baseClass == FigureMarker.class) {
- switch (baseFeatureID) {
- case GMFGraphPackage.FIGURE_MARKER__PARENT: return GMFGraphPackage.SHAPE__PARENT;
- default: return -1;
- }
- }
if (baseClass == FigureHandle.class) {
switch (baseFeatureID) {
case GMFGraphPackage.FIGURE_HANDLE__REFERENCING_ELEMENTS: return GMFGraphPackage.SHAPE__REFERENCING_ELEMENTS;

Back to the top