dpchou 20070518 BZ154167
diff --git a/plugins/org.eclipse.datatools.modelbase.derby/model/derby.cat b/plugins/org.eclipse.datatools.modelbase.derby/model/derby.cat
index e2ac95f..a512147 100644
--- a/plugins/org.eclipse.datatools.modelbase.derby/model/derby.cat
+++ b/plugins/org.eclipse.datatools.modelbase.derby/model/derby.cat
@@ -47,6 +47,13 @@
quid "430FC70B03C8"
supplier "Logical View::SQLModel::Tables::Table"
quidu "3E9B1FB60047")))
+ (object Class "DerbySchema"
+ quid "464DEFF801D4"
+ superclasses (list inheritance_relationship_list
+ (object Inheritance_Relationship
+ quid "464DF0120326"
+ supplier "Logical View::SQLModel::Schema::Schema"
+ quidu "3ED523C20089")))
(object Association "$UNNAMED$0"
quid "430FB4A60302"
roles (list role_list
@@ -71,40 +78,11 @@
origin_x 0
origin_y 0
items (list diagram_item_list
- (object ClassView "Class" "Logical View::SQLModel::Tables::Table" @1
- ShowCompartmentStereotypes TRUE
- IncludeOperation TRUE
- location (572, 234)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics TRUE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @1
- location (460, 159)
- fill_color 13434879
- nlines 1
- max_width 224
- justify 0
- label "Table")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3E9B1FB60047"
- width 242
- height 174
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::derby::Synonym" @2
+ (object ClassView "Class" "Logical View::derby::Synonym" @1
ShowCompartmentStereotypes TRUE
IncludeAttribute TRUE
IncludeOperation TRUE
- location (603, 856)
+ location (1529, 1080)
font (object Font
size 10
face "Arial"
@@ -115,8 +93,8 @@
color 0
default_color TRUE)
label (object ItemLabel
- Parent_View @2
- location (483, 805)
+ Parent_View @1
+ location (1409, 1029)
fill_color 13434879
nlines 1
max_width 240
@@ -130,8 +108,37 @@
height 126
annotation 8
autoResize TRUE)
+ (object ClassView "Class" "Logical View::SQLModel::Tables::Table" @2
+ ShowCompartmentStereotypes TRUE
+ IncludeOperation TRUE
+ location (1498, 458)
+ font (object Font
+ size 10
+ face "Arial"
+ bold FALSE
+ italics TRUE
+ underline FALSE
+ strike FALSE
+ color 0
+ default_color TRUE)
+ label (object ItemLabel
+ Parent_View @2
+ location (1386, 383)
+ fill_color 13434879
+ nlines 1
+ max_width 224
+ justify 0
+ label "Table")
+ icon_style "Icon"
+ line_color 3342489
+ fill_color 13434879
+ quidu "3E9B1FB60047"
+ width 242
+ height 174
+ annotation 8
+ autoResize TRUE)
(object AssociationViewNew "$UNNAMED$0" @3
- location (919, 533)
+ location (1845, 758)
font (object Font
size 10
face "Arial"
@@ -147,7 +154,7 @@
roleview_list (list RoleViews
(object RoleView "$UNNAMED$1" @4
Parent_View @3
- location (541, -195)
+ location (1467, 30)
font (object Font
size 10
face "Arial"
@@ -161,17 +168,17 @@
line_color 3342489
quidu "430FB4AA01BE"
client @3
- supplier @1
+ supplier @2
vertices (list Points
- (919, 533)
- (919, 244)
- (693, 244))
+ (1845, 758)
+ (1845, 468)
+ (1619, 468))
line_style 3
- origin_attachment (919, 533)
- terminal_attachment (693, 244)
+ origin_attachment (1845, 758)
+ terminal_attachment (1619, 468)
label (object SegLabel @5
Parent_View @4
- location (745, 191)
+ location (1671, 415)
font (object Font
size 10
face "Arial"
@@ -192,7 +199,7 @@
orientation 1))
(object RoleView "$UNNAMED$2" @6
Parent_View @3
- location (541, -195)
+ location (1467, 30)
font (object Font
size 10
face "Arial"
@@ -206,17 +213,17 @@
line_color 3342489
quidu "430FB4AA01C8"
client @3
- supplier @2
+ supplier @1
vertices (list Points
- (919, 533)
- (919, 862)
- (732, 862))
+ (1845, 758)
+ (1845, 1086)
+ (1658, 1086))
line_style 3
- origin_attachment (919, 533)
- terminal_attachment (732, 862)
+ origin_attachment (1845, 758)
+ terminal_attachment (1658, 1086)
label (object SegLabel @7
Parent_View @6
- location (784, 916)
+ location (1710, 1140)
font (object Font
size 10
face "Arial"
@@ -239,8 +246,201 @@
stereotype TRUE
line_color 3342489
quidu "430FC70B03C8"
- client @2
- supplier @1
+ client @1
+ supplier @2
line_style 3
- origin_attachment (600, 793)
- terminal_attachment (600, 320))))))
+ origin_attachment (1526, 1017)
+ terminal_attachment (1526, 545))
+ (object ClassView "Class" "Logical View::SQLModel::Schema::Schema" @9
+ ShowCompartmentStereotypes TRUE
+ IncludeAttribute TRUE
+ IncludeOperation TRUE
+ location (500, 461)
+ font (object Font
+ size 10
+ face "Arial"
+ bold FALSE
+ italics FALSE
+ underline FALSE
+ strike FALSE
+ color 0
+ default_color TRUE)
+ label (object ItemLabel
+ Parent_View @9
+ location (371, 387)
+ fill_color 13434879
+ nlines 1
+ max_width 258
+ justify 0
+ label "Schema")
+ icon_style "Icon"
+ line_color 3342489
+ fill_color 13434879
+ quidu "3ED523C20089"
+ width 276
+ height 172
+ annotation 8
+ autoResize TRUE)
+ (object AssociationViewNew "" @10
+ location (1007, 459)
+ stereotype TRUE
+ line_color 3342489
+ quidu "3F4BB65C00FC"
+ roleview_list (list RoleViews
+ (object RoleView "schema" @11
+ Parent_View @10
+ location (435, 225)
+ font (object Font
+ size 10
+ face "Arial"
+ bold FALSE
+ italics FALSE
+ underline FALSE
+ strike FALSE
+ color 0
+ default_color TRUE)
+ label (object SegLabel @12
+ Parent_View @11
+ location (713, 502)
+ font (object Font
+ size 10
+ face "Arial"
+ bold FALSE
+ italics FALSE
+ underline FALSE
+ strike FALSE
+ color 0
+ default_color TRUE)
+ anchor 1
+ anchor_loc 1
+ nlines 1
+ max_width 160
+ justify 0
+ label "-schema"
+ pctDist 0.800000
+ height 42
+ orientation 0)
+ stereotype TRUE
+ line_color 3342489
+ quidu "3F4BB65D0099"
+ client @10
+ supplier @9
+ line_style 0
+ label (object SegLabel @13
+ Parent_View @11
+ location (675, 407)
+ font (object Font
+ size 10
+ face "Arial"
+ bold FALSE
+ italics FALSE
+ underline FALSE
+ strike FALSE
+ color 0
+ default_color TRUE)
+ anchor 2
+ anchor_loc 1
+ nlines 1
+ max_width 15
+ justify 0
+ label "1"
+ pctDist 0.900000
+ height 54
+ orientation 1))
+ (object RoleView "tables" @14
+ Parent_View @10
+ location (435, 225)
+ font (object Font
+ size 10
+ face "Arial"
+ bold FALSE
+ italics FALSE
+ underline FALSE
+ strike FALSE
+ color 0
+ default_color TRUE)
+ label (object SegLabel @15
+ Parent_View @14
+ location (1301, 500)
+ font (object Font
+ size 10
+ face "Arial"
+ bold FALSE
+ italics FALSE
+ underline FALSE
+ strike FALSE
+ color 0
+ default_color TRUE)
+ anchor 1
+ anchor_loc 1
+ nlines 1
+ max_width 122
+ justify 0
+ label "-tables"
+ pctDist 0.800000
+ height 42
+ orientation 1)
+ stereotype TRUE
+ line_color 3342489
+ quidu "3F4BB65D0085"
+ client @10
+ supplier @2
+ line_style 0
+ label (object SegLabel @16
+ Parent_View @14
+ location (1339, 405)
+ font (object Font
+ size 10
+ face "Arial"
+ bold FALSE
+ italics FALSE
+ underline FALSE
+ strike FALSE
+ color 0
+ default_color TRUE)
+ anchor 2
+ anchor_loc 1
+ nlines 1
+ max_width 15
+ justify 0
+ label "0..n"
+ pctDist 0.900000
+ height 54
+ orientation 0))))
+ (object ClassView "Class" "Logical View::derby::DerbySchema" @17
+ ShowCompartmentStereotypes TRUE
+ IncludeAttribute TRUE
+ IncludeOperation TRUE
+ location (500, 1068)
+ font (object Font
+ size 10
+ face "Arial"
+ bold FALSE
+ italics FALSE
+ underline FALSE
+ strike FALSE
+ color 0
+ default_color TRUE)
+ label (object ItemLabel
+ Parent_View @17
+ location (333, 1017)
+ fill_color 13434879
+ nlines 1
+ max_width 334
+ justify 0
+ label "DerbySchema")
+ icon_style "Icon"
+ line_color 3342489
+ fill_color 13434879
+ quidu "464DEFF801D4"
+ width 352
+ height 126
+ annotation 8
+ autoResize TRUE)
+ (object InheritView "" @18
+ stereotype TRUE
+ line_color 3342489
+ quidu "464DF0120326"
+ client @17
+ supplier @9
+ line_style 0)))))
diff --git a/plugins/org.eclipse.datatools.modelbase.derby/model/derby.ecore b/plugins/org.eclipse.datatools.modelbase.derby/model/derby.ecore
index 8d5dfe0..bad1063 100644
--- a/plugins/org.eclipse.datatools.modelbase.derby/model/derby.ecore
+++ b/plugins/org.eclipse.datatools.modelbase.derby/model/derby.ecore
@@ -6,4 +6,5 @@
<eClassifiers xsi:type="ecore:EClass" name="Synonym" eSuperTypes="../../org.eclipse.datatools.modelbase.sql/model/sqlmodel.ecore#//tables/Table ../../org.eclipse.datatools.modelbase.sql/model/sqlmodel.ecore#//schema/SQLObject">
<eStructuralFeatures xsi:type="ecore:EReference" name="Table" lowerBound="1" eType="ecore:EClass ../../org.eclipse.datatools.modelbase.sql/model/sqlmodel.ecore#//tables/Table"/>
</eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="DerbySchema" eSuperTypes="../../org.eclipse.datatools.modelbase.sql/model/sqlmodel.ecore#//schema/Schema"/>
</ecore:EPackage>
diff --git a/plugins/org.eclipse.datatools.modelbase.derby/model/derby.genmodel b/plugins/org.eclipse.datatools.modelbase.derby/model/derby.genmodel
index 4ddaad0..cb07e06 100644
--- a/plugins/org.eclipse.datatools.modelbase.derby/model/derby.genmodel
+++ b/plugins/org.eclipse.datatools.modelbase.derby/model/derby.genmodel
@@ -12,5 +12,6 @@
<genClasses ecoreClass="derby.ecore#//Synonym">
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference derby.ecore#//Synonym/Table"/>
</genClasses>
+ <genClasses ecoreClass="derby.ecore#//DerbySchema"/>
</genPackages>
</genmodel:GenModel>
diff --git a/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/DerbyModelFactory.java b/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/DerbyModelFactory.java
index 149bb1e..d9c0d0d 100644
--- a/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/DerbyModelFactory.java
+++ b/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/DerbyModelFactory.java
@@ -39,6 +39,15 @@
Synonym createSynonym();
/**
+ * Returns a new object of class '<em>Derby Schema</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Derby Schema</em>'.
+ * @generated
+ */
+ DerbySchema createDerbySchema();
+
+ /**
* Returns the package supported by this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/DerbyModelPackage.java b/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/DerbyModelPackage.java
index 59af007..f48551a 100644
--- a/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/DerbyModelPackage.java
+++ b/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/DerbyModelPackage.java
@@ -10,6 +10,8 @@
*******************************************************************************/
package org.eclipse.datatools.modelbase.derby;
+import org.eclipse.datatools.modelbase.sql.schema.SQLSchemaPackage;
+
import org.eclipse.datatools.modelbase.sql.tables.SQLTablesPackage;
import org.eclipse.emf.ecore.EClass;
@@ -238,6 +240,179 @@
/**
+ * The meta object id for the '{@link org.eclipse.datatools.modelbase.derby.impl.DerbySchemaImpl <em>Derby Schema</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.datatools.modelbase.derby.impl.DerbySchemaImpl
+ * @see org.eclipse.datatools.modelbase.derby.impl.DerbyModelPackageImpl#getDerbySchema()
+ * @generated
+ */
+ int DERBY_SCHEMA = 1;
+
+ /**
+ * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DERBY_SCHEMA__EANNOTATIONS = SQLSchemaPackage.SCHEMA__EANNOTATIONS;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DERBY_SCHEMA__NAME = SQLSchemaPackage.SCHEMA__NAME;
+
+ /**
+ * The feature id for the '<em><b>Dependencies</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DERBY_SCHEMA__DEPENDENCIES = SQLSchemaPackage.SCHEMA__DEPENDENCIES;
+
+ /**
+ * The feature id for the '<em><b>Description</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DERBY_SCHEMA__DESCRIPTION = SQLSchemaPackage.SCHEMA__DESCRIPTION;
+
+ /**
+ * The feature id for the '<em><b>Label</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DERBY_SCHEMA__LABEL = SQLSchemaPackage.SCHEMA__LABEL;
+
+ /**
+ * The feature id for the '<em><b>Comments</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DERBY_SCHEMA__COMMENTS = SQLSchemaPackage.SCHEMA__COMMENTS;
+
+ /**
+ * The feature id for the '<em><b>Triggers</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DERBY_SCHEMA__TRIGGERS = SQLSchemaPackage.SCHEMA__TRIGGERS;
+
+ /**
+ * The feature id for the '<em><b>Indices</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DERBY_SCHEMA__INDICES = SQLSchemaPackage.SCHEMA__INDICES;
+
+ /**
+ * The feature id for the '<em><b>Tables</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DERBY_SCHEMA__TABLES = SQLSchemaPackage.SCHEMA__TABLES;
+
+ /**
+ * The feature id for the '<em><b>Sequences</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DERBY_SCHEMA__SEQUENCES = SQLSchemaPackage.SCHEMA__SEQUENCES;
+
+ /**
+ * The feature id for the '<em><b>Database</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DERBY_SCHEMA__DATABASE = SQLSchemaPackage.SCHEMA__DATABASE;
+
+ /**
+ * The feature id for the '<em><b>Catalog</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DERBY_SCHEMA__CATALOG = SQLSchemaPackage.SCHEMA__CATALOG;
+
+ /**
+ * The feature id for the '<em><b>Assertions</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DERBY_SCHEMA__ASSERTIONS = SQLSchemaPackage.SCHEMA__ASSERTIONS;
+
+ /**
+ * The feature id for the '<em><b>User Defined Types</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DERBY_SCHEMA__USER_DEFINED_TYPES = SQLSchemaPackage.SCHEMA__USER_DEFINED_TYPES;
+
+ /**
+ * The feature id for the '<em><b>Char Sets</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DERBY_SCHEMA__CHAR_SETS = SQLSchemaPackage.SCHEMA__CHAR_SETS;
+
+ /**
+ * The feature id for the '<em><b>Routines</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DERBY_SCHEMA__ROUTINES = SQLSchemaPackage.SCHEMA__ROUTINES;
+
+ /**
+ * The feature id for the '<em><b>Owner</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DERBY_SCHEMA__OWNER = SQLSchemaPackage.SCHEMA__OWNER;
+
+ /**
+ * The number of structural features of the '<em>Derby Schema</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DERBY_SCHEMA_FEATURE_COUNT = SQLSchemaPackage.SCHEMA_FEATURE_COUNT + 0;
+
+
+ /**
* Returns the meta object for class '{@link org.eclipse.datatools.modelbase.derby.Synonym <em>Synonym</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -259,6 +434,16 @@
EReference getSynonym_Table();
/**
+ * Returns the meta object for class '{@link org.eclipse.datatools.modelbase.derby.DerbySchema <em>Derby Schema</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Derby Schema</em>'.
+ * @see org.eclipse.datatools.modelbase.derby.DerbySchema
+ * @generated
+ */
+ EClass getDerbySchema();
+
+ /**
* Returns the factory that creates the instances of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -298,6 +483,16 @@
*/
EReference SYNONYM__TABLE = eINSTANCE.getSynonym_Table();
+ /**
+ * The meta object literal for the '{@link org.eclipse.datatools.modelbase.derby.impl.DerbySchemaImpl <em>Derby Schema</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.datatools.modelbase.derby.impl.DerbySchemaImpl
+ * @see org.eclipse.datatools.modelbase.derby.impl.DerbyModelPackageImpl#getDerbySchema()
+ * @generated
+ */
+ EClass DERBY_SCHEMA = eINSTANCE.getDerbySchema();
+
}
} //DerbyModelPackage
diff --git a/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/DerbySchema.java b/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/DerbySchema.java
new file mode 100644
index 0000000..271737e
--- /dev/null
+++ b/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/DerbySchema.java
@@ -0,0 +1,22 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.datatools.modelbase.derby;
+
+import org.eclipse.datatools.modelbase.sql.schema.Schema;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Derby Schema</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.datatools.modelbase.derby.DerbyModelPackage#getDerbySchema()
+ * @model
+ * @generated
+ */
+public interface DerbySchema extends Schema {
+} // DerbySchema
diff --git a/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/impl/DerbyModelFactoryImpl.java b/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/impl/DerbyModelFactoryImpl.java
index 5fc8059..ba028c5 100644
--- a/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/impl/DerbyModelFactoryImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/impl/DerbyModelFactoryImpl.java
@@ -65,6 +65,7 @@
public EObject create(EClass eClass) {
switch (eClass.getClassifierID()) {
case DerbyModelPackage.SYNONYM: return createSynonym();
+ case DerbyModelPackage.DERBY_SCHEMA: return createDerbySchema();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
@@ -85,6 +86,16 @@
* <!-- end-user-doc -->
* @generated
*/
+ public DerbySchema createDerbySchema() {
+ DerbySchemaImpl derbySchema = new DerbySchemaImpl();
+ return derbySchema;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public DerbyModelPackage getDerbyModelPackage() {
return (DerbyModelPackage)getEPackage();
}
diff --git a/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/impl/DerbyModelPackageImpl.java b/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/impl/DerbyModelPackageImpl.java
index 73d07bc..77af424 100644
--- a/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/impl/DerbyModelPackageImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/impl/DerbyModelPackageImpl.java
@@ -12,6 +12,7 @@
import org.eclipse.datatools.modelbase.derby.DerbyModelFactory;
import org.eclipse.datatools.modelbase.derby.DerbyModelPackage;
+import org.eclipse.datatools.modelbase.derby.DerbySchema;
import org.eclipse.datatools.modelbase.derby.Synonym;
import org.eclipse.datatools.modelbase.sql.accesscontrol.SQLAccessControlPackage;
@@ -70,6 +71,13 @@
private EClass synonymEClass = null;
/**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass derbySchemaEClass = null;
+
+ /**
* Creates an instance of the model <b>Package</b>, registered with
* {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
* package URI value.
@@ -171,6 +179,15 @@
* <!-- end-user-doc -->
* @generated
*/
+ public EClass getDerbySchema() {
+ return derbySchemaEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public DerbyModelFactory getDerbyModelFactory() {
return (DerbyModelFactory)getEFactoryInstance();
}
@@ -196,6 +213,8 @@
// Create classes and their features
synonymEClass = createEClass(SYNONYM);
createEReference(synonymEClass, SYNONYM__TABLE);
+
+ derbySchemaEClass = createEClass(DERBY_SCHEMA);
}
/**
@@ -228,11 +247,14 @@
// Add supertypes to classes
synonymEClass.getESuperTypes().add(theSQLTablesPackage.getTable());
synonymEClass.getESuperTypes().add(theSQLSchemaPackage.getSQLObject());
+ derbySchemaEClass.getESuperTypes().add(theSQLSchemaPackage.getSchema());
// Initialize classes and features; add operations and parameters
initEClass(synonymEClass, Synonym.class, "Synonym", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getSynonym_Table(), theSQLTablesPackage.getTable(), null, "Table", null, 1, 1, Synonym.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(derbySchemaEClass, DerbySchema.class, "DerbySchema", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
// Create resource
createResource(eNS_URI);
}
diff --git a/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/impl/DerbySchemaImpl.java b/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/impl/DerbySchemaImpl.java
new file mode 100644
index 0000000..e9dd518
--- /dev/null
+++ b/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/impl/DerbySchemaImpl.java
@@ -0,0 +1,44 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.datatools.modelbase.derby.impl;
+
+import org.eclipse.datatools.modelbase.derby.DerbyModelPackage;
+import org.eclipse.datatools.modelbase.derby.DerbySchema;
+
+import org.eclipse.datatools.modelbase.sql.schema.impl.SchemaImpl;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Derby Schema</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class DerbySchemaImpl extends SchemaImpl implements DerbySchema {
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected DerbySchemaImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected EClass eStaticClass() {
+ return DerbyModelPackage.Literals.DERBY_SCHEMA;
+ }
+
+} //DerbySchemaImpl
diff --git a/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/util/DerbyModelAdapterFactory.java b/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/util/DerbyModelAdapterFactory.java
index db00528..40a1f00 100644
--- a/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/util/DerbyModelAdapterFactory.java
+++ b/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/util/DerbyModelAdapterFactory.java
@@ -14,6 +14,8 @@
import org.eclipse.datatools.modelbase.sql.schema.SQLObject;
+import org.eclipse.datatools.modelbase.sql.schema.Schema;
+
import org.eclipse.datatools.modelbase.sql.tables.Table;
import org.eclipse.emf.common.notify.Adapter;
@@ -83,6 +85,9 @@
public Object caseSynonym(Synonym object) {
return createSynonymAdapter();
}
+ public Object caseDerbySchema(DerbySchema object) {
+ return createDerbySchemaAdapter();
+ }
public Object caseEModelElement(EModelElement object) {
return createEModelElementAdapter();
}
@@ -95,6 +100,9 @@
public Object caseTable(Table object) {
return createTableAdapter();
}
+ public Object caseSchema(Schema object) {
+ return createSchemaAdapter();
+ }
public Object defaultCase(EObject object) {
return createEObjectAdapter();
}
@@ -128,6 +136,20 @@
}
/**
+ * Creates a new adapter for an object of class '{@link org.eclipse.datatools.modelbase.derby.DerbySchema <em>Derby Schema</em>}'.
+ * <!-- begin-user-doc -->
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ * <!-- end-user-doc -->
+ * @return the new adapter.
+ * @see org.eclipse.datatools.modelbase.derby.DerbySchema
+ * @generated
+ */
+ public Adapter createDerbySchemaAdapter() {
+ return null;
+ }
+
+ /**
* Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
@@ -184,6 +206,20 @@
}
/**
+ * Creates a new adapter for an object of class '{@link org.eclipse.datatools.modelbase.sql.schema.Schema <em>Schema</em>}'.
+ * <!-- begin-user-doc -->
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ * <!-- end-user-doc -->
+ * @return the new adapter.
+ * @see org.eclipse.datatools.modelbase.sql.schema.Schema
+ * @generated
+ */
+ public Adapter createSchemaAdapter() {
+ return null;
+ }
+
+ /**
* Creates a new adapter for the default case.
* <!-- begin-user-doc -->
* This default implementation returns null.
diff --git a/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/util/DerbyModelSwitch.java b/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/util/DerbyModelSwitch.java
index ee142b8..ab22fe5 100644
--- a/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/util/DerbyModelSwitch.java
+++ b/plugins/org.eclipse.datatools.modelbase.derby/src/org/eclipse/datatools/modelbase/derby/util/DerbyModelSwitch.java
@@ -16,6 +16,8 @@
import org.eclipse.datatools.modelbase.sql.schema.SQLObject;
+import org.eclipse.datatools.modelbase.sql.schema.Schema;
+
import org.eclipse.datatools.modelbase.sql.tables.Table;
import org.eclipse.emf.ecore.EClass;
@@ -107,6 +109,16 @@
if (result == null) result = defaultCase(theEObject);
return result;
}
+ case DerbyModelPackage.DERBY_SCHEMA: {
+ DerbySchema derbySchema = (DerbySchema)theEObject;
+ Object result = caseDerbySchema(derbySchema);
+ if (result == null) result = caseSchema(derbySchema);
+ if (result == null) result = caseSQLObject(derbySchema);
+ if (result == null) result = caseENamedElement(derbySchema);
+ if (result == null) result = caseEModelElement(derbySchema);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
default: return defaultCase(theEObject);
}
}
@@ -127,6 +139,21 @@
}
/**
+ * Returns the result of interpretting the object as an instance of '<em>Derby Schema</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpretting the object as an instance of '<em>Derby Schema</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public Object caseDerbySchema(DerbySchema object) {
+ return null;
+ }
+
+ /**
* Returns the result of interpretting the object as an instance of '<em>EModel Element</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
@@ -187,6 +214,21 @@
}
/**
+ * Returns the result of interpretting the object as an instance of '<em>Schema</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpretting the object as an instance of '<em>Schema</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public Object caseSchema(Schema object) {
+ return null;
+ }
+
+ /**
* Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;