diff options
Diffstat (limited to 'examples')
145 files changed, 2807 insertions, 3023 deletions
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/extlibrary.Book.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/extlibrary.Book.jdo index bd3d0f471..76d28d5e6 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/extlibrary.Book.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/extlibrary.Book.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:55 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:43 CEST 2006 --> <jdo> <package name="extlibrary.impl"> <class name="extlibrary.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="datastore"> @@ -16,7 +16,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="extlibrary.impl.WriterImpl"/> </field> @@ -35,7 +35,7 @@ <collection element-type="extlibrary.impl.ItemImpl" dependent-element="true"> <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> - <column name="stock_id" allows-null="true"/> + <column name="library_stock_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="none"/> @@ -44,7 +44,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BRANCHES_IDX"/> - <column name="parentbranch_id" allows-null="true"/> + <column name="library_parentbranch_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="people" persistence-modifier="persistent"> @@ -87,7 +87,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -134,7 +134,7 @@ <version strategy="version-number" column="e_version"/> <field name="reader" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="reader_id" allows-null="true"/> + <column name="person_reader_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="extlibrary.impl.PersonImpl"/> </field> @@ -156,7 +156,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="VIDEOCASSETTE_CAST_IDX"/> - <column name="cast_id" allows-null="true"/> + <column name="videocassette_cast_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -194,7 +194,7 @@ <version strategy="version-number" column="e_version"/> <field name="manager" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="manager_id" allows-null="true"/> + <column name="employee_manager_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="extlibrary.impl.EmployeeImpl"/> </field> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/main.ChildObject2.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/main.ChildObject2.jdo index 807dc2305..4ecf2f6b2 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/main.ChildObject2.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/main.ChildObject2.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:33:18 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:43 CEST 2006 --> <jdo> <package name="main.impl"> <class name="main.impl.ChildObject2Impl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="datastore"> @@ -45,7 +45,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="BASEGROUP_COMPONENTS_IDX"/> - <column name="group_id" allows-null="true"/> + <column name="basecomponent_group_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.basic.Basic.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.basic.Basic.jdo index 7c0ebde09..c9405bd23 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.basic.Basic.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.basic.Basic.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:46 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:41 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.annotations.basic.impl"> <class name="org.eclipse.emf.teneo.samples.emf.annotations.basic.impl.BasicImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="basic" identity-type="datastore"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.Book.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.Book.jdo index b0d0a3c66..0e76c1595 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.Book.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.Book.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:32 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:35 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl"> <class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore"> @@ -19,7 +19,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.WriterImpl"/> </field> @@ -38,7 +38,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -46,7 +46,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -64,7 +64,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.column.Book.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.column.Book.jdo index ef713aea7..35d35b462 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.column.Book.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.column.Book.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:42 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.annotations.column.impl"> <class name="org.eclipse.emf.teneo.samples.emf.annotations.column.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="mybooktable" identity-type="datastore"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.compositeid.Parent.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.compositeid.Parent.jdo index b945b04f5..688718e2a 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.compositeid.Parent.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.compositeid.Parent.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:34 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:36 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl"> <class name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.ParentImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="application"> @@ -15,8 +15,8 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PARENT_CHILDREN_IDX"/> - <column name="children_firstname" allows-null="true"/> - <column name="children_lastname" allows-null="true"/> + <column name="parent_children_firstname" allows-null="true"/> + <column name="parent_children_lastname" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.duplicates.ChildItem.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.duplicates.ChildItem.jdo index 6e79d7975..f9499a981 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.duplicates.ChildItem.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.duplicates.ChildItem.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:54 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:44 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl"> <class name="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl.ChildItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="childitem" identity-type="datastore"> @@ -23,12 +23,13 @@ </inheritance> <version strategy="version-number" column="e_version"/> <field name="name" persistence-modifier="persistent" null-value="exception"/> - <field name="childItem" persistence-modifier="persistent" table="item_childitem" delete-action="restrict"> + <field name="childItem" persistence-modifier="persistent" delete-action="restrict"> <collection element-type="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl.ChildItemImpl" dependent-element="true"> <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> - <join/> <order column="ITEM_CHILDITEM_IDX"/> + <column name="item_childitem_id" allows-null="true"/> + <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> </package> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.Book.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.Book.jdo index ab15a844b..10e84f2cb 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.Book.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.Book.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:27 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:33 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl"> <class name="org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="mybooktable" identity-type="datastore"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.id.IdentityID.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.id.IdentityID.jdo index 6cbd88aa1..c66830b5b 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.id.IdentityID.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.id.IdentityID.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:52 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:44 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl"> <class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.IdentityIDImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="identityid" identity-type="application"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.Address.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.Address.jdo index 8cdc2f1be..d994ce076 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.Address.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.Address.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:50 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:43 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl"> <class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="address" identity-type="application"> @@ -28,7 +28,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CONTENTLIST_ADDRESS_IDX"/> - <column name="address_name" allows-null="true"/> + <column name="contentlist_address_name" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="price" persistence-modifier="persistent" delete-action="restrict"> @@ -36,7 +36,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CONTENTLIST_PRICE_IDX"/> - <column name="price_name" allows-null="true"/> + <column name="contentlist_price_name" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.lazy.Book.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.lazy.Book.jdo index e75d651a3..6295997c9 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.lazy.Book.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.lazy.Book.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:38 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:38 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl"> <class name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore"> @@ -19,7 +19,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.WriterImpl"/> </field> @@ -38,7 +38,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="false"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -46,7 +46,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="false"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -64,7 +64,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.lob.Person.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.lob.Person.jdo index 911aad2af..dddc669ac 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.lob.Person.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.lob.Person.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:31 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:35 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl"> <class name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="person" identity-type="application"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.manytomany.Cntr.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.manytomany.Cntr.jdo index ffc132494..edcfd0199 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.manytomany.Cntr.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.manytomany.Cntr.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:40 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:39 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl"> <class name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl.CntrImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="cntr" identity-type="datastore"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.Document.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.Document.jdo index 9d5552727..b36541116 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.Document.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.Document.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:44 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:40 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl"> <class name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl.DocumentImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="application"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.nmset.MyItem.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.nmset.MyItem.jdo index 803960f36..16712bb6d 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.nmset.MyItem.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.nmset.MyItem.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:56 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:45 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl"> <class name="org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl.MyItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="myitem" identity-type="datastore"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.Printer.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.Printer.jdo index b723bb4ef..224aa9287 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.Printer.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.Printer.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:29 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:34 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.impl"> <class name="org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.impl.PrinterImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="printer" identity-type="datastore"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.set.ContainedItem.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.set.ContainedItem.jdo index a4f0d5b75..bdec1cf01 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.set.ContainedItem.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.set.ContainedItem.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:58 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:46 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl"> <class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="containeditem" identity-type="datastore"> @@ -25,7 +25,7 @@ <field name="name" persistence-modifier="persistent" null-value="exception"/> <field name="itemList" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="itemlist_id" allows-null="true"/> + <column name="item_itemlist_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemListImpl"/> </field> @@ -43,14 +43,14 @@ <collection element-type="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" dependent-element="true"> <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> - <column name="containeditem_id" allows-null="true"/> + <column name="itemlist_containeditem_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="item" persistence-modifier="persistent" delete-action="restrict"> <collection element-type="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemImpl" dependent-element="false"> <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> - <column name="itemlist_id" allows-null="true"/> + <column name="item_itemlist_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="joinedItem" persistence-modifier="persistent" table="itemlist_item" delete-action="restrict"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.toone.Address.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.toone.Address.jdo index 5a32e884c..d845d8135 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.toone.Address.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.toone.Address.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:36 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:37 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl"> <class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.AddressImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="address" identity-type="datastore"> @@ -38,7 +38,7 @@ <version strategy="version-number" column="e_version"/> <field name="address" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="address_id" allows-null="true"/> + <column name="address_address_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.AddressImpl"/> </field> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.Item.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.Item.jdo index f54a6b9c3..80c9c46af 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.Item.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.Item.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:28:42 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:40 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl"> <class name="org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl.ItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="MYITEMTABLE" identity-type="datastore"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.detach.detachelist.Contacts.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.detach.detachelist.Contacts.jdo index aa10928a1..a98af12d3 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.detach.detachelist.Contacts.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.detach.detachelist.Contacts.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:12 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:50 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.detach.detachelist.impl"> <class name="org.eclipse.emf.teneo.samples.emf.detach.detachelist.impl.ContactsImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="contacts" identity-type="datastore"> @@ -17,7 +17,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CONTACTS_PERSONS_IDX"/> - <column name="persons_id" allows-null="true"/> + <column name="contacts_persons_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="containedPersons" persistence-modifier="persistent" delete-action="restrict"> @@ -25,7 +25,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CONTACTS_CONTAINEDPERSONS_IDX"/> - <column name="containedpersons_id" allows-null="true"/> + <column name="contacts_containedpersons_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -43,7 +43,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PERSON_CHILDREN_IDX"/> - <column name="children_id" allows-null="true"/> + <column name="person_children_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.Contacts.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.Contacts.jdo index 9f49b3869..3a19b22b6 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.Contacts.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.Contacts.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:14 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:14 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.impl"> <class name="org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.impl.ContactsImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="contacts" identity-type="datastore"> @@ -17,7 +17,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CONTACTS_PERSONS_IDX"/> - <column name="persons_id" allows-null="true"/> + <column name="contacts_persons_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.detach.detachtest.TestA.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.detach.detachtest.TestA.jdo index 9c44fc27b..f8f3b99e9 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.detach.detachtest.TestA.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.detach.detachtest.TestA.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:10 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:54:49 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.detach.detachtest.impl"> <class name="org.eclipse.emf.teneo.samples.emf.detach.detachtest.impl.TestAImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="testa" identity-type="datastore"> @@ -15,7 +15,7 @@ <field name="code" persistence-modifier="persistent" null-value="exception"/> <field name="testB" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="testb_id" allows-null="false"/> + <column name="testb_testb_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.detach.detachtest.impl.TestBImpl"/> </field> @@ -45,7 +45,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="TESTC_TESTB_IDX"/> - <column name="testb_id" allows-null="true"/> + <column name="testc_testb_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.elist.featuremap.PriceByQuantityType.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.elist.featuremap.PriceByQuantityType.jdo index b51a42b39..63e8917a0 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.elist.featuremap.PriceByQuantityType.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.elist.featuremap.PriceByQuantityType.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:19 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:15 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl"> <class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.PriceByQuantityTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="pricebyquantitytype" identity-type="datastore"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.relation.relation1to1.ContainedChildNR.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.relation.relation1to1.ContainedChildNR.jdo index 9460e7200..aed935254 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.relation.relation1to1.ContainedChildNR.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.relation.relation1to1.ContainedChildNR.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:29 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:24 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl"> <class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.ContainedChildNRImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="containedchildnr" identity-type="datastore"> @@ -36,25 +36,25 @@ <field name="nameESet" persistence-modifier="persistent"/> <field name="containedonewayrequired" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="containedonewayrequired_id" allows-null="false"/> + <column name="containedchildr_containedonewayrequired_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.ContainedChildRImpl"/> </field> <field name="containedoneWaynotrequired" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="containedonewaynotrequired_id" allows-null="true"/> + <column name="containedchildnr_containedonewaynotrequired_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.ContainedChildNRImpl"/> </field> <field name="notcontainedonewayrequired" persistence-modifier="persistent" delete-action="restrict" null-value="exception"> <foreign-key> - <column name="notcontainedonewayrequired_id" allows-null="false"/> + <column name="notcontainedchildr_notcontainedonewayrequired_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildRImpl"/> </field> <field name="notcontainedonewaynotrequired" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="notcontainedonewaynotrequired_id" allows-null="true"/> + <column name="notcontainedchildnr_notcontainedonewaynotrequired_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildNRImpl"/> </field> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.relation.relation1ton.Main.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.relation.relation1ton.Main.jdo index 21a19d1d3..12f1e89d5 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.relation.relation1ton.Main.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.relation.relation1ton.Main.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:31 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:25 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl"> <class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.MainImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="main" identity-type="datastore"> @@ -19,7 +19,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_ONECR_IDX"/> - <column name="onecr_id" allows-null="true"/> + <column name="main_onecr_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="onecn" persistence-modifier="persistent" delete-action="restrict"> @@ -27,7 +27,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_ONECN_IDX"/> - <column name="onecn_id" allows-null="true"/> + <column name="main_onecn_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="onenr" persistence-modifier="persistent" delete-action="restrict"> @@ -35,7 +35,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_ONENR_IDX"/> - <column name="onenr_id" allows-null="true"/> + <column name="main_onenr_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="onenn" persistence-modifier="persistent" delete-action="restrict"> @@ -43,7 +43,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_ONENN_IDX"/> - <column name="onenn_id" allows-null="true"/> + <column name="main_onenn_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="twocr" persistence-modifier="persistent" delete-action="restrict"> @@ -51,7 +51,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_TWOCR_IDX"/> - <column name="main_id" allows-null="true"/> + <column name="twocr_main_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="twocn" persistence-modifier="persistent" delete-action="restrict"> @@ -59,7 +59,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_TWOCN_IDX"/> - <column name="main_id" allows-null="true"/> + <column name="twocn_main_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="twonr" persistence-modifier="persistent" delete-action="restrict"> @@ -67,7 +67,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_TWONR_IDX"/> - <column name="main_id" allows-null="true"/> + <column name="twonr_main_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="twonn" persistence-modifier="persistent" delete-action="restrict"> @@ -75,7 +75,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MAIN_TWONN_IDX"/> - <column name="main_id" allows-null="true"/> + <column name="twonn_main_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -150,7 +150,7 @@ <field name="name" persistence-modifier="persistent" null-value="exception"/> <field name="main" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="main_id" allows-null="true"/> + <column name="twonn_main_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.MainImpl"/> </field> @@ -166,7 +166,7 @@ <field name="name" persistence-modifier="persistent" null-value="exception"/> <field name="main" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="main_id" allows-null="true"/> + <column name="twonr_main_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.MainImpl"/> </field> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.relation.relationntom.Main.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.relation.relationntom.Main.jdo index 295d1f75b..46d1f800b 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.relation.relationntom.Main.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.relation.relationntom.Main.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:29:33 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:55:29 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.relation.relationntom.impl"> <class name="org.eclipse.emf.teneo.samples.emf.relation.relationntom.impl.MainImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="main" identity-type="datastore"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.accounting.Account.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.accounting.Account.jdo index 32a272f91..4741ec453 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.accounting.Account.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.accounting.Account.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:09 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:54 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl"> <class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.AccountImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="account" identity-type="datastore"> @@ -28,7 +28,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ACCOUNTGROUP_ACCOUNT_IDX"/> - <column name="account_id" allows-null="true"/> + <column name="accountgroup_account_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -47,7 +47,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ACCOUNTING_ACCOUNTGROUP_IDX"/> - <column name="accountgroup_id" allows-null="true"/> + <column name="accounting_accountgroup_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="vat" persistence-modifier="persistent" delete-action="restrict"> @@ -55,18 +55,18 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ACCOUNTING_VAT_IDX"/> - <column name="vat_id" allows-null="true"/> + <column name="accounting_vat_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="vatAccount" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="vataccount_id" allows-null="true"/> + <column name="balanceaccount_vataccount_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.BalanceAccountImpl"/> </field> <field name="report" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="report_id" allows-null="true"/> + <column name="report_report_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.ReportImpl"/> </field> @@ -75,7 +75,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ACCOUNTING_JOURNALGROUP_IDX"/> - <column name="journalgroup_id" allows-null="true"/> + <column name="accounting_journalgroup_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -106,7 +106,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="JOURNALGROUP_JOURNALGROUPS_IDX"/> - <column name="journalgroups_id" allows-null="true"/> + <column name="journalgroup_journalgroups_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="journalStatements" persistence-modifier="persistent" delete-action="restrict"> @@ -114,7 +114,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="JOURNALGROUP_JOURNALSTATEMENTS_IDX"/> - <column name="journalstatements_id" allows-null="true"/> + <column name="journalgroup_journalstatements_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -132,19 +132,19 @@ <field name="amountESet" persistence-modifier="persistent"/> <field name="debitAccount" persistence-modifier="persistent" delete-action="restrict" null-value="exception"> <foreign-key> - <column name="debitaccount_id" allows-null="false"/> + <column name="account_debitaccount_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.AccountImpl"/> </field> <field name="creditAccount" persistence-modifier="persistent" delete-action="restrict" null-value="exception"> <foreign-key> - <column name="creditaccount_id" allows-null="false"/> + <column name="account_creditaccount_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.AccountImpl"/> </field> <field name="vat" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="vat_id" allows-null="true"/> + <column name="vat_vat_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.VatImpl"/> </field> @@ -167,13 +167,13 @@ <field name="name" persistence-modifier="persistent" null-value="exception"/> <field name="debitReportGroup" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="debitreportgroup_id" allows-null="false"/> + <column name="reportgroup_debitreportgroup_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.ReportGroupImpl"/> </field> <field name="creditReportGroup" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="creditreportgroup_id" allows-null="false"/> + <column name="reportgroup_creditreportgroup_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.ReportGroupImpl"/> </field> @@ -192,7 +192,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="REPORTGROUP_REPORTGROUP_IDX"/> - <column name="reportgroup_id" allows-null="true"/> + <column name="reportgroup_reportgroup_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="account" persistence-modifier="persistent" delete-action="restrict"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.catalog.CatalogType.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.catalog.CatalogType.jdo index 47e64ca27..ad0f5b528 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.catalog.CatalogType.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.catalog.CatalogType.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:25 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:10 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl"> <class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.CatalogTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="catalogtype" identity-type="application"> @@ -19,7 +19,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CATALOGTYPE_SUBCATALOG_IDX"/> - <column name="subcatalog_name" allows-null="true"/> + <column name="catalogtype_subcatalog_name" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="product" persistence-modifier="persistent" delete-action="restrict"> @@ -27,7 +27,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CATALOGTYPE_PRODUCT_IDX"/> - <column name="product_name" allows-null="true"/> + <column name="catalogtype_product_name" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -45,7 +45,7 @@ <field name="quantityToESet" persistence-modifier="persistent"/> <field name="supplier" persistence-modifier="persistent" delete-action="restrict" null-value="exception"> <foreign-key> - <column name="supplier_id" allows-null="false"/> + <column name="suppliertype_supplier_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.SupplierTypeImpl"/> </field> @@ -66,12 +66,12 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PRODUCTTYPE_REMARK_IDX"/> - <column name="remark_code" allows-null="true"/> + <column name="producttype_remark_code" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="price" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="price_id" allows-null="false"/> + <column name="pricetype_price_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.PriceTypeImpl"/> </field> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.epo2.Item.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.epo2.Item.jdo index 0806903c8..716859133 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.epo2.Item.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.epo2.Item.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:05 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:52 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl"> <class name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.ItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="item" identity-type="datastore"> @@ -43,18 +43,18 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PURCHASEORDER_ITEMS_IDX"/> - <column name="order_id" allows-null="true"/> + <column name="item_order_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="billTo" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="billto_id" allows-null="false"/> + <column name="address_billto_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.AddressImpl"/> </field> <field name="shipTo" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="shipto_id" allows-null="true"/> + <column name="address_shipto_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.AddressImpl"/> </field> @@ -63,13 +63,13 @@ <field name="status" persistence-modifier="persistent" null-value="none" embedded="true"/> <field name="customer" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="customer_id" allows-null="true"/> + <column name="purchaseorder_customer_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.CustomerImpl"/> </field> <field name="previousOrder" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="previousorder_id" allows-null="true"/> + <column name="purchaseorder_previousorder_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.PurchaseOrderImpl"/> </field> @@ -99,7 +99,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="SUPPLIER_CUSTOMERS_IDX"/> - <column name="customers_id" allows-null="true"/> + <column name="supplier_customers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="orders" persistence-modifier="persistent" delete-action="restrict"> @@ -107,7 +107,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="SUPPLIER_ORDERS_IDX"/> - <column name="orders_id" allows-null="true"/> + <column name="supplier_orders_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -125,7 +125,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CUSTOMER_ORDERS_IDX"/> - <column name="customer_id" allows-null="true"/> + <column name="purchaseorder_customer_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.forum.Forum.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.forum.Forum.jdo index c64dcecd1..021f9d1d7 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.forum.Forum.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.forum.Forum.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:23 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:07 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.sample.forum.impl"> <class name="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.ForumImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="forum" identity-type="datastore"> @@ -18,7 +18,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="FORUM_MEMBERS_IDX"/> - <column name="members_id" allows-null="true"/> + <column name="forum_members_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="topics" persistence-modifier="persistent" delete-action="restrict"> @@ -26,7 +26,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="FORUM_TOPICS_IDX"/> - <column name="topics_id" allows-null="true"/> + <column name="forum_topics_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -44,7 +44,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MEMBER_POSTS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="post_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="created" persistence-modifier="persistent" delete-action="restrict"> @@ -52,7 +52,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="MEMBER_CREATED_IDX"/> - <column name="creator_id" allows-null="true"/> + <column name="topic_creator_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -67,13 +67,13 @@ <field name="comment" persistence-modifier="persistent" null-value="exception"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="post_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.MemberImpl"/> </field> <field name="topic" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="topic_id" allows-null="true"/> + <column name="post_topic_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.TopicImpl"/> </field> @@ -91,7 +91,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="creator" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="creator_id" allows-null="true"/> + <column name="topic_creator_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.MemberImpl"/> </field> @@ -100,7 +100,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="TOPIC_POSTS_IDX"/> - <column name="topic_id" allows-null="true"/> + <column name="post_topic_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.inv.PType.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.inv.PType.jdo index 6153bae52..d1a131b22 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.inv.PType.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.inv.PType.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:58 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:46 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.sample.inv.impl"> <class name="org.eclipse.emf.teneo.samples.emf.sample.inv.impl.PTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="ptype" identity-type="application"> @@ -16,7 +16,7 @@ <field name="name" persistence-modifier="persistent" null-value="none"/> <field name="base" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="base_id" allows-null="true"/> + <column name="ptype_base_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.inv.impl.PTypeImpl"/> </field> @@ -24,7 +24,7 @@ <collection element-type="org.eclipse.emf.teneo.samples.emf.sample.inv.impl.PTypeImpl" dependent-element="false"> <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> - <column name="base_id" allows-null="true"/> + <column name="ptype_base_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> <field name="subNOTypes" persistence-modifier="persistent" table="ptype_ptype" delete-action="restrict"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.library.Book.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.library.Book.jdo index f724714f3..65146299b 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.library.Book.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.library.Book.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:36 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.sample.library.impl"> <class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore"> @@ -21,7 +21,7 @@ <field name="categoryESet" persistence-modifier="persistent"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl"/> </field> @@ -42,7 +42,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -50,7 +50,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -70,7 +70,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.play.ActType.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.play.ActType.jdo index dd2e79f5b..bcf98a8f7 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.play.ActType.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.play.ActType.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:14 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:00 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.sample.play.impl"> <class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.ActTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="acttype" identity-type="datastore"> @@ -17,7 +17,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ACTTYPE_SCENE_IDX"/> - <column name="scene_id" allows-null="true"/> + <column name="acttype_scene_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="pindex" persistence-modifier="persistent" null-value="none"/> @@ -103,13 +103,13 @@ <field name="title" persistence-modifier="persistent" null-value="exception"/> <field name="fm" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="fm_id" allows-null="false"/> + <column name="fmtype_fm_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.play.impl.FmTypeImpl"/> </field> <field name="personae" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="personae_id" allows-null="false"/> + <column name="personaetype_personae_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.play.impl.PersonaeTypeImpl"/> </field> @@ -120,7 +120,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PLAYTYPE_ACT_IDX"/> - <column name="act_id" allows-null="true"/> + <column name="playtype_act_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.product.ProductType.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.product.ProductType.jdo index d74229eb5..73c5e47fd 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.product.ProductType.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.product.ProductType.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:17 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:03 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.sample.product.impl"> <class name="org.eclipse.emf.teneo.samples.emf.sample.product.impl.ProductTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="producttype" identity-type="application"> @@ -17,7 +17,7 @@ <field name="id" persistence-modifier="persistent" primary-key="true"/> <field name="supplier" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="supplier_id" allows-null="false"/> + <column name="suppliertype_supplier_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.product.impl.SupplierTypeImpl"/> </field> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.DocumentRoot.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.DocumentRoot.jdo index b72f7dabd..b97980b18 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.DocumentRoot.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.DocumentRoot.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:20 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:05 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl"> <class name="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl.ItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="item" identity-type="datastore"> @@ -29,13 +29,13 @@ <version strategy="version-number" column="e_version"/> <field name="shipTo" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="shipto_id" allows-null="true"/> + <column name="usaddress_shipto_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl.USAddressImpl"/> </field> <field name="billTo" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="billto_id" allows-null="false"/> + <column name="usaddress_billto_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl.USAddressImpl"/> </field> @@ -45,7 +45,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PURCHASEORDER_ITEMS_IDX"/> - <column name="items_id" allows-null="true"/> + <column name="purchaseorder_items_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="orderDate" persistence-modifier="persistent" null-value="none" serialized="true"/> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.Book.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.Book.jdo index 8818726a7..9d2713d4c 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.Book.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.Book.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:31:03 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:50 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl"> <class name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore"> @@ -17,7 +17,7 @@ <field name="category" persistence-modifier="persistent" null-value="none" embedded="true"/> <field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl.WriterImpl"/> </field> @@ -36,7 +36,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="library_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="books" persistence-modifier="persistent" delete-action="restrict"> @@ -44,7 +44,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="LIBRARY_BOOKS_IDX"/> - <column name="books_id" allows-null="true"/> + <column name="library_books_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -62,7 +62,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WRITER_BOOKS_IDX"/> - <column name="author_id" allows-null="true"/> + <column name="book_author_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.sunBooks.AuthorsType.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.sunBooks.AuthorsType.jdo index 1bb65e5c1..5bead5d21 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.sunBooks.AuthorsType.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.sunBooks.AuthorsType.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:53 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:41 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl"> <class name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.AuthorsTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="authorstype" identity-type="datastore"> @@ -33,7 +33,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="BOOKSTYPE_BOOK_IDX"/> - <column name="book_id" allows-null="true"/> + <column name="bookstype_book_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -51,14 +51,14 @@ <field name="price" persistence-modifier="persistent" null-value="exception"/> <field name="authors" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="authors_id" allows-null="false"/> + <column name="authorstype_authors_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.AuthorsTypeImpl"/> </field> <field name="description" persistence-modifier="persistent" null-value="none"/> <field name="promotion" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="promotion_id" allows-null="false"/> + <column name="promotiontype_promotion_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.PromotionTypeImpl"/> </field> @@ -77,7 +77,7 @@ <version strategy="version-number" column="e_version"/> <field name="books" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="books_id" allows-null="false"/> + <column name="bookstype_books_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.BooksTypeImpl"/> </field> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.workflow.Workflow.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.workflow.Workflow.jdo index bdceeeadd..d24e4f8fc 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.workflow.Workflow.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.workflow.Workflow.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:30:50 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:56:38 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl"> <class name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.WorkflowImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="datastore"> @@ -15,7 +15,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WORKFLOW_NODES_IDX"/> - <column name="workflow_id" allows-null="true"/> + <column name="workflownode_workflow_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="edges" persistence-modifier="persistent" delete-action="restrict"> @@ -23,7 +23,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WORKFLOW_EDGES_IDX"/> - <column name="workflow_id" allows-null="true"/> + <column name="edge_workflow_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="comments" persistence-modifier="persistent" delete-action="restrict"> @@ -31,7 +31,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WORKFLOW_COMMENTS_IDX"/> - <column name="workflow_id" allows-null="true"/> + <column name="comment_workflow_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -46,7 +46,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WORKFLOWNODE_OUTPUTS_IDX"/> - <column name="node_id" allows-null="true"/> + <column name="outputport_node_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="inputs" persistence-modifier="persistent" delete-action="restrict"> @@ -54,7 +54,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="WORKFLOWNODE_INPUTS_IDX"/> - <column name="node_id" allows-null="true"/> + <column name="inputport_node_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="isStart" persistence-modifier="persistent" null-value="none"/> @@ -68,13 +68,13 @@ <version strategy="version-number" column="e_version"/> <field name="target" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="target_id" allows-null="true"/> + <column name="edge_target_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.InputPortImpl"/> </field> <field name="source" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="source_id" allows-null="true"/> + <column name="edge_source_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.OutputPortImpl"/> </field> @@ -90,7 +90,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="INPUTPORT_EDGES_IDX"/> - <column name="target_id" allows-null="true"/> + <column name="edge_target_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -105,7 +105,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="OUTPUTPORT_EDGES_IDX"/> - <column name="source_id" allows-null="true"/> + <column name="edge_source_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -124,7 +124,7 @@ <version strategy="version-number" column="e_version"/> <field name="subworkflow" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="subworkflow_id" allows-null="true"/> + <column name="workflow_subworkflow_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.WorkflowImpl"/> </field> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.A.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.A.jdo index a918cf94e..59ab8cdae 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.A.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.A.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:50 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:22 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.impl"> <class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.impl.AImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="a" identity-type="datastore"> @@ -19,7 +19,7 @@ <field name="lonESet" persistence-modifier="persistent"/> <field name="myB" persistence-modifier="persistent" delete-action="restrict" null-value="exception"> <foreign-key> - <column name="myb_id" allows-null="false"/> + <column name="b_myb_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.impl.BImpl"/> </field> @@ -52,7 +52,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <join> - <column name="multianytype_id" allows-null="true"/> + <column name="testany_multianytype_id" allows-null="true"/> </join> <element> <embedded> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.A.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.A.jdo index 2c75ad5c1..62dccc1b2 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.A.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.A.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:37 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:10 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.impl"> <class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.impl.AImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="a" identity-type="application"> @@ -23,7 +23,7 @@ <field name="d" persistence-modifier="persistent" null-value="exception"/> <field name="myR" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="myr_id" allows-null="true"/> + <column name="r_myr_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.impl.RImpl"/> </field> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.Element.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.Element.jdo index ff1ed396d..973ddfb77 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.Element.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.Element.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:23 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:56 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl"> <class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.ElementImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="element" identity-type="datastore"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Book.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Book.jdo index aa8476097..f0e285426 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Book.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Book.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:12 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:47 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl"> <class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore"> @@ -18,7 +18,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="BOOK_WRITERS_IDX"/> - <column name="writers_id" allows-null="true"/> + <column name="book_writers_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="keyWords" persistence-modifier="persistent" delete-action="restrict"> @@ -26,7 +26,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="BOOK_KEYWORDS_IDX"/> - <column name="keywords_id" allows-null="true"/> + <column name="book_keywords_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> <field name="cityByWriter" persistence-modifier="persistent" delete-action="restrict"> @@ -34,7 +34,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="BOOK_CITYBYWRITER_IDX"/> - <column name="citybywriter_id" allows-null="true"/> + <column name="book_citybywriter_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> @@ -56,7 +56,7 @@ <field name="key" persistence-modifier="persistent" null-value="none"/> <field name="value" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="value_id" allows-null="true"/> + <column name="writer_value_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl"/> </field> @@ -79,7 +79,7 @@ <version strategy="version-number" column="e_version"/> <field name="key" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="key_id" allows-null="true"/> + <column name="writer_key_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl"/> </field> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.Address.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.Address.jdo index 6808f7fca..7d5f8de12 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.Address.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.Address.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:31 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:05 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl"> <class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="address" identity-type="datastore"> @@ -27,7 +27,7 @@ <field name="name" persistence-modifier="persistent" null-value="exception"/> <field name="firstAddress" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="firstaddress_id" allows-null="false"/> + <column name="firstaddressholder_firstaddress_id" allows-null="false"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.FirstAddressHolderImpl"/> </field> @@ -36,7 +36,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ADDRESSLIST_SECONDADDRESS_IDX"/> - <column name="secondaddress_id" allows-null="true"/> + <column name="addresslist_secondaddress_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -62,7 +62,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="FIRSTADDRESSHOLDER_VALUE_IDX"/> - <column name="value_id" allows-null="true"/> + <column name="firstaddressholder_value_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.Address.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.Address.jdo index 8cf280269..bac58ecf4 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.Address.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.Address.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:43 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:14 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl"> <class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="address" identity-type="datastore"> @@ -50,13 +50,13 @@ <field name="groupName" persistence-modifier="persistent" null-value="exception"/> <field name="shipTo" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="shipto_id" allows-null="true"/> + <column name="address_shipto_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressImpl"/> </field> <field name="billTo" persistence-modifier="persistent" dependent="true" delete-action="restrict" null-value="none"> <foreign-key delete-action="cascade" update-action="cascade"> - <column name="billto_id" allows-null="true"/> + <column name="address_billto_id" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressImpl"/> </field> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.statesByCountry.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.statesByCountry.jdo index 02d30877b..f57126ee7 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.statesByCountry.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.statesByCountry.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:18 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:52 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.impl"> <class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.impl.statesByCountryImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="statesbycountry" identity-type="datastore"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.statesByCountry.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.statesByCountry.jdo index 5562dec12..2b19c70d2 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.statesByCountry.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.statesByCountry.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:20 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:54 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.impl"> <class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.impl.statesByCountryImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="statesbycountry" identity-type="datastore"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.DocumentRoot.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.DocumentRoot.jdo index 6d3b1cc7a..3a51b9ac9 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.DocumentRoot.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.DocumentRoot.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:28 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:02 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl"> <class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl.LetterBodyTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="letterbodytype" identity-type="datastore"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.A.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.A.jdo index 23c1dec7f..17b80a7a9 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.A.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.A.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:25 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:58 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl"> <class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.AImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="a" identity-type="datastore"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.Member.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.Member.jdo index a1fbc2efe..04a47b8a5 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.Member.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.Member.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:34 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:07 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.impl"> <class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.impl.MemberImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="datastore"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.PurchaseOrder.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.PurchaseOrder.jdo index c5af68773..6c41ec4ac 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.PurchaseOrder.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.PurchaseOrder.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:40 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:12 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl"> <class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl.PurchaseOrderImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="purchaseorder" identity-type="datastore"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleList.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleList.jdo index 2b307b26a..c6fe861c9 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleList.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleList.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:15 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:57:49 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl"> <class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleListImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="simplelist" identity-type="datastore"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.ComplexNumber.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.ComplexNumber.jdo index a73c03c2f..1b7a194f2 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.ComplexNumber.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.ComplexNumber.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:45 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:17 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl"> <class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.ComplexNumberImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="complexnumber" identity-type="datastore"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.ComplexAAA.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.ComplexAAA.jdo index 908bc9c6a..8be917c1f 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.ComplexAAA.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.ComplexAAA.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:32:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:19 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl"> <class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexAAAImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="complexaaa" identity-type="datastore"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.abstractreference.Address.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.abstractreference.Address.jdo index 3adfb039b..ad2b8178e 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.abstractreference.Address.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.abstractreference.Address.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:33:33 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:59:01 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.issues.abstractreference.impl"> <class name="org.eclipse.emf.teneo.samples.issues.abstractreference.impl.AddressImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="address" identity-type="datastore"> @@ -18,7 +18,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="ADDRESS_COUNTRY_IDX"/> - <column name="country_id" allows-null="true"/> + <column name="address_country_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -36,7 +36,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="CITY_ADDRESS_IDX"/> - <column name="address_id" allows-null="true"/> + <column name="city_address_id" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> @@ -54,7 +54,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="PERSON_ADDRESS_IDX"/> - <column name="address_id" allows-null="true"/> + <column name="person_address_id" allows-null="true"/> <foreign-key delete-action="cascade" update-action="cascade"/> </field> </class> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.bagduplicate.Person.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.bagduplicate.Person.jdo index dc975a795..b3df71e81 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.bagduplicate.Person.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.bagduplicate.Person.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:33:24 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:52 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.issues.bagduplicate.impl"> <class name="org.eclipse.emf.teneo.samples.issues.bagduplicate.impl.PersonImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="person" identity-type="application"> @@ -15,13 +15,13 @@ <field name="name" persistence-modifier="persistent" primary-key="true"/> <field name="father" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="father_name" allows-null="true"/> + <column name="person_father_name" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.issues.bagduplicate.impl.PersonImpl"/> </field> <field name="mother" persistence-modifier="persistent" delete-action="restrict" null-value="none"> <foreign-key> - <column name="mother_name" allows-null="true"/> + <column name="person_mother_name" allows-null="true"/> </foreign-key> <extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.issues.bagduplicate.impl.PersonImpl"/> </field> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.enumtest.Item.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.enumtest.Item.jdo index d6ceab365..ae72331c4 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.enumtest.Item.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.enumtest.Item.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:33:27 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:56 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.issues.enumtest.impl"> <class name="org.eclipse.emf.teneo.samples.issues.enumtest.impl.ItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="item" identity-type="application"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.inheritance.Annotation.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.inheritance.Annotation.jdo index 56bf30680..96182aa6d 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.inheritance.Annotation.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.inheritance.Annotation.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:33:21 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:49 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.issues.inheritance.impl"> <class name="org.eclipse.emf.teneo.samples.issues.inheritance.impl.AnnotationImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="application"> @@ -56,7 +56,7 @@ <extension vendor-name="jpox" key="cache-lazy-loading" value="true"/> </collection> <order column="THING_THINGS_IDX"/> - <column name="things_name" allows-null="true"/> + <column name="thing_things_name" allows-null="true"/> <foreign-key delete-action="restrict" update-action="cascade"/> </field> </class> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.interfacetrue.Address.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.interfacetrue.Address.jdo index 6be140f8d..a738bf5aa 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.interfacetrue.Address.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.interfacetrue.Address.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:33:31 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:58:58 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.issues.interfacetrue.impl"> <class name="org.eclipse.emf.teneo.samples.issues.interfacetrue.impl.USAddressImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="datastore"> diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.simplenm.Me.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.simplenm.Me.jdo index 5a796b8b7..8287386dd 100644 --- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.simplenm.Me.jdo +++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.issues.simplenm.Me.jdo @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"> -<!-- Generated by Teneo on Thu Sep 28 21:33:36 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:59:04 CEST 2006 --> <jdo> <package name="org.eclipse.emf.teneo.samples.issues.simplenm.impl"> <class name="org.eclipse.emf.teneo.samples.issues.simplenm.impl.MeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="me" identity-type="datastore"> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/associationoverride/model/AssociationOverride.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/associationoverride/model/AssociationOverride.xsd index b62aba852..f9e712532 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/associationoverride/model/AssociationOverride.xsd +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/associationoverride/model/AssociationOverride.xsd @@ -11,7 +11,7 @@ <xsd:complexType name="Person">
<xsd:annotation>
- <xsd:appinfo source="http://annotation.elver.org/MappedSuperclass">true</xsd:appinfo>
+ <xsd:appinfo source="teneo.jpa">@MappedSuperclass</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="id" type="xsd:long">
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/Item.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/Item.java index 7fdef8c01..905b3282f 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/Item.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/Item.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Item.java,v 1.1 2006/07/11 16:57:04 mtaal Exp $ + * $Id: Item.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.duplicates; @@ -65,8 +65,8 @@ public interface Item extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Child Item</em>' containment reference list. * @see org.eclipse.emf.teneo.samples.emf.annotations.duplicates.DuplicatesPackage#getItem_ChildItem() - * @model type="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.ChildItem" containment="true" resolveProxies="false" required="true" - * annotation="http://facet.elver.org/List unique='false'" + * @model type="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.ChildItem" containment="true" required="true" + * annotation="teneo.jpa appinfo='@OneToMany(unique=true)'" * extendedMetaData="kind='element' name='childItem'" * @generated */ diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/impl/DuplicatesPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/impl/DuplicatesPackageImpl.java index 8c7f4745a..43e732647 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/impl/DuplicatesPackageImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/impl/DuplicatesPackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: DuplicatesPackageImpl.java,v 1.1 2006/07/11 16:57:03 mtaal Exp $ + * $Id: DuplicatesPackageImpl.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl; @@ -235,8 +235,8 @@ public class DuplicatesPackageImpl extends EPackageImpl implements DuplicatesPac // Create annotations // http:///org/eclipse/emf/ecore/util/ExtendedMetaData createExtendedMetaDataAnnotations(); - // http://facet.elver.org/List - createListAnnotations(); + // teneo.jpa + createTeneoAnnotations(); } /** @@ -285,18 +285,18 @@ public class DuplicatesPackageImpl extends EPackageImpl implements DuplicatesPac } /** - * Initializes the annotations for <b>http://facet.elver.org/List</b>. + * Initializes the annotations for <b>teneo.jpa</b>. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected void createListAnnotations() { - String source = "http://facet.elver.org/List"; + protected void createTeneoAnnotations() { + String source = "teneo.jpa"; addAnnotation (getItem_ChildItem(), source, new String[] { - "unique", "false" + "appinfo", "@OneToMany(unique=true)" }); } diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/model/duplicates.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/model/duplicates.ecore index dba6e1467..bbe437b11 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/model/duplicates.ecore +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/model/duplicates.ecore @@ -30,8 +30,8 @@ </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="childItem" lowerBound="1" upperBound="-1" eType="#//ChildItem" containment="true" resolveProxies="false"> - <eAnnotations source="http://facet.elver.org/List"> - <details key="unique" value="false"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@OneToMany(unique=true)"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/model/duplicates.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/model/duplicates.xsd index 152388dd0..bdadfb754 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/model/duplicates.xsd +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/duplicates/model/duplicates.xsd @@ -17,7 +17,7 @@ <xsd:element name="name" type="xsd:string"/> <xsd:element name="childItem" type="this:ChildItem" maxOccurs="unbounded"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/Unique">false</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@OneToMany(unique=true)</xsd:appinfo> </xsd:annotation> </xsd:element> </xsd:sequence> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/Embeddable.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/Embeddable.java index 625b60444..8c08ef591 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/Embeddable.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/Embeddable.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Embeddable.java,v 1.2 2006/09/07 10:06:30 mtaal Exp $ + * $Id: Embeddable.java,v 1.3 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.embedded; @@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject; * </p> * * @see org.eclipse.emf.teneo.samples.emf.annotations.embedded.EmbeddedPackage#getEmbeddable() - * @model annotation="http://annotation.elver.org/Embeddable appinfo='true'" + * @model annotation="teneo.jpa appinfo='@Embeddable'" * extendedMetaData="name='Embeddable' kind='elementOnly'" * @generated */ diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/impl/EmbeddedPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/impl/EmbeddedPackageImpl.java index ff45d5151..72e72626f 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/impl/EmbeddedPackageImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/impl/EmbeddedPackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: EmbeddedPackageImpl.java,v 1.3 2006/09/05 12:16:35 mtaal Exp $ + * $Id: EmbeddedPackageImpl.java,v 1.4 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl; @@ -277,28 +277,10 @@ public class EmbeddedPackageImpl extends EPackageImpl implements EmbeddedPackage createResource(eNS_URI); // Create annotations - // http://annotation.elver.org/Embeddable - createEmbeddableAnnotations(); - // http:///org/eclipse/emf/ecore/util/ExtendedMetaData - createExtendedMetaDataAnnotations(); // teneo.jpa createTeneoAnnotations(); - } - - /** - * Initializes the annotations for <b>http://annotation.elver.org/Embeddable</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void createEmbeddableAnnotations() { - String source = "http://annotation.elver.org/Embeddable"; - addAnnotation - (embeddableEClass, - source, - new String[] { - "appinfo", "true" - }); + // http:///org/eclipse/emf/ecore/util/ExtendedMetaData + createExtendedMetaDataAnnotations(); } /** @@ -381,7 +363,13 @@ public class EmbeddedPackageImpl extends EPackageImpl implements EmbeddedPackage * @generated */ protected void createTeneoAnnotations() { - String source = "teneo.jpa"; + String source = "teneo.jpa"; + addAnnotation + (embeddableEClass, + source, + new String[] { + "appinfo", "@Embeddable" + }); addAnnotation (getEmbedder_FirstEmbedded(), source, diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/model/embedded.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/model/embedded.ecore index 4df2a2b2b..edc73eb08 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/model/embedded.ecore +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/model/embedded.ecore @@ -4,8 +4,8 @@ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="embedded" nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/embedded" nsPrefix="embedded"> <eClassifiers xsi:type="ecore:EClass" name="Embeddable"> - <eAnnotations source="http://annotation.elver.org/Embeddable"> - <details key="appinfo" value="true"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Embeddable"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="name" value="Embeddable"/> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/model/embedded.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/model/embedded.xsd index 9f8805a5d..639ca7bfa 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/model/embedded.xsd +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embedded/model/embedded.xsd @@ -51,7 +51,7 @@ <xsd:complexType name="Embeddable"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/Embeddable">true</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@Embeddable</xsd:appinfo> </xsd:annotation> <xsd:sequence> <xsd:element name="myString" type="xsd:string"/> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/EmbeddedidFactory.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/EmbeddedidFactory.java index 61d869493..d81977991 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/EmbeddedidFactory.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/EmbeddedidFactory.java @@ -2,54 +2,54 @@ * <copyright>
* </copyright>
*
- * $Id: EmbeddedidFactory.java,v 1.1 2006/07/11 16:57:17 mtaal Exp $
+ * $Id: EmbeddedidFactory.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid;
import org.eclipse.emf.ecore.EFactory;
-/**
+/** * <!-- begin-user-doc -->
* The <b>Factory</b> for the model.
* It provides a create method for each non-abstract class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage + * @generated */
public interface EmbeddedidFactory extends EFactory {
- /**
- * The singleton instance of the factory.
+ /** + * The singleton instance of the factory. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
EmbeddedidFactory eINSTANCE = org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.EmbeddedidFactoryImpl.init();
- /**
- * Returns a new object of class '<em>Name</em>'.
+ /** + * Returns a new object of class '<em>Name</em>'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return a new object of class '<em>Name</em>'.
- * @generated
+ * @return a new object of class '<em>Name</em>'. + * @generated */
- Name createName();
-
- /**
- * Returns a new object of class '<em>Person</em>'.
+ Name createName(); + + /** + * Returns a new object of class '<em>Person</em>'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return a new object of class '<em>Person</em>'.
- * @generated
+ * @return a new object of class '<em>Person</em>'. + * @generated */
- Person createPerson();
-
- /**
- * Returns the package supported by this factory.
+ Person createPerson(); + + /** + * Returns the package supported by this factory. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the package supported by this factory.
- * @generated
+ * @return the package supported by this factory. + * @generated */
- EmbeddedidPackage getEmbeddedidPackage();
-
+ EmbeddedidPackage getEmbeddedidPackage(); + } //EmbeddedidFactory
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/EmbeddedidPackage.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/EmbeddedidPackage.java index 63f29473e..e3f41e938 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/EmbeddedidPackage.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/EmbeddedidPackage.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: EmbeddedidPackage.java,v 1.1 2006/07/11 16:57:17 mtaal Exp $
+ * $Id: EmbeddedidPackage.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid;
@@ -11,7 +11,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-/**
+/** * <!-- begin-user-doc -->
* The <b>Package</b> for the model.
* It contains accessors for the meta objects to represent
@@ -22,192 +22,192 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidFactory
- * @model kind="package"
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidFactory + * @model kind="package" + * @generated */
public interface EmbeddedidPackage extends EPackage {
- /**
- * The package name.
+ /** + * The package name. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
String eNAME = "embeddedid";
- /**
- * The package namespace URI.
+ /** + * The package namespace URI. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
String eNS_URI = "http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid";
- /**
- * The package namespace name.
+ /** + * The package namespace name. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
String eNS_PREFIX = "embeddedid";
- /**
- * The singleton instance of the package.
+ /** + * The singleton instance of the package. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
EmbeddedidPackage eINSTANCE = org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.EmbeddedidPackageImpl.init();
- /**
- * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl <em>Name</em>}' class.
+ /** + * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl <em>Name</em>}' class. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.EmbeddedidPackageImpl#getName_()
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.EmbeddedidPackageImpl#getName_() + * @generated */
int NAME = 0;
- /**
- * The feature id for the '<em><b>First Name</b></em>' attribute.
+ /** + * The feature id for the '<em><b>First Name</b></em>' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- * @ordered
+ * @generated + * @ordered */
int NAME__FIRST_NAME = 0;
- /**
- * The feature id for the '<em><b>Last Name</b></em>' attribute.
+ /** + * The feature id for the '<em><b>Last Name</b></em>' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- * @ordered
+ * @generated + * @ordered */
int NAME__LAST_NAME = 1;
- /**
- * The number of structural features of the '<em>Name</em>' class.
+ /** + * The number of structural features of the '<em>Name</em>' class. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- * @ordered
+ * @generated + * @ordered */
int NAME_FEATURE_COUNT = 2;
- /**
- * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl <em>Person</em>}' class.
+ /** + * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl <em>Person</em>}' class. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.EmbeddedidPackageImpl#getPerson()
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.EmbeddedidPackageImpl#getPerson() + * @generated */
int PERSON = 1;
- /**
- * The feature id for the '<em><b>Name</b></em>' containment reference.
+ /** + * The feature id for the '<em><b>Name</b></em>' containment reference. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- * @ordered
+ * @generated + * @ordered */
int PERSON__NAME = 0;
- /**
- * The feature id for the '<em><b>Address</b></em>' attribute.
+ /** + * The feature id for the '<em><b>Address</b></em>' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- * @ordered
+ * @generated + * @ordered */
int PERSON__ADDRESS = 1;
- /**
- * The number of structural features of the '<em>Person</em>' class.
+ /** + * The number of structural features of the '<em>Person</em>' class. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- * @ordered
+ * @generated + * @ordered */
int PERSON_FEATURE_COUNT = 2;
- /**
- * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name <em>Name</em>}'.
+ /** + * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name <em>Name</em>}'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for class '<em>Name</em>'.
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name
- * @generated
+ * @return the meta object for class '<em>Name</em>'. + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name + * @generated */
- EClass getName_();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getFirstName <em>First Name</em>}'.
+ EClass getName_(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getFirstName <em>First Name</em>}'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>First Name</em>'.
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getFirstName()
- * @see #getName_()
- * @generated
+ * @return the meta object for the attribute '<em>First Name</em>'. + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getFirstName() + * @see #getName_() + * @generated */
- EAttribute getName_FirstName();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getLastName <em>Last Name</em>}'.
+ EAttribute getName_FirstName(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getLastName <em>Last Name</em>}'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Last Name</em>'.
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getLastName()
- * @see #getName_()
- * @generated
+ * @return the meta object for the attribute '<em>Last Name</em>'. + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getLastName() + * @see #getName_() + * @generated */
- EAttribute getName_LastName();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person <em>Person</em>}'.
+ EAttribute getName_LastName(); + + /** + * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person <em>Person</em>}'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for class '<em>Person</em>'.
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person
- * @generated
+ * @return the meta object for class '<em>Person</em>'. + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person + * @generated */
- EClass getPerson();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getName <em>Name</em>}'.
+ EClass getPerson(); + + /** + * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getName <em>Name</em>}'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Name</em>'.
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getName()
- * @see #getPerson()
- * @generated
+ * @return the meta object for the containment reference '<em>Name</em>'. + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getName() + * @see #getPerson() + * @generated */
- EReference getPerson_Name();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getAddress <em>Address</em>}'.
+ EReference getPerson_Name(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getAddress <em>Address</em>}'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Address</em>'.
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getAddress()
- * @see #getPerson()
- * @generated
+ * @return the meta object for the attribute '<em>Address</em>'. + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getAddress() + * @see #getPerson() + * @generated */
- EAttribute getPerson_Address();
-
- /**
- * Returns the factory that creates the instances of the model.
+ EAttribute getPerson_Address(); + + /** + * Returns the factory that creates the instances of the model. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the factory that creates the instances of the model.
- * @generated
+ * @return the factory that creates the instances of the model. + * @generated */
- EmbeddedidFactory getEmbeddedidFactory();
-
- /**
+ EmbeddedidFactory getEmbeddedidFactory(); + + /** * <!-- begin-user-doc -->
* Defines literals for the meta objects that represent
* <ul>
@@ -217,58 +217,58 @@ public interface EmbeddedidPackage extends EPackage { * <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- interface Literals {
- /**
- * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl <em>Name</em>}' class.
+ interface Literals {
+ /** + * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl <em>Name</em>}' class. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.EmbeddedidPackageImpl#getName_()
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.EmbeddedidPackageImpl#getName_() + * @generated */
EClass NAME = eINSTANCE.getName_();
- /**
- * The meta object literal for the '<em><b>First Name</b></em>' attribute feature.
+ /** + * The meta object literal for the '<em><b>First Name</b></em>' attribute feature. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
EAttribute NAME__FIRST_NAME = eINSTANCE.getName_FirstName();
- /**
- * The meta object literal for the '<em><b>Last Name</b></em>' attribute feature.
+ /** + * The meta object literal for the '<em><b>Last Name</b></em>' attribute feature. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
EAttribute NAME__LAST_NAME = eINSTANCE.getName_LastName();
- /**
- * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl <em>Person</em>}' class.
+ /** + * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl <em>Person</em>}' class. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.EmbeddedidPackageImpl#getPerson()
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.EmbeddedidPackageImpl#getPerson() + * @generated */
EClass PERSON = eINSTANCE.getPerson();
- /**
- * The meta object literal for the '<em><b>Name</b></em>' containment reference feature.
+ /** + * The meta object literal for the '<em><b>Name</b></em>' containment reference feature. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
EReference PERSON__NAME = eINSTANCE.getPerson_Name();
- /**
- * The meta object literal for the '<em><b>Address</b></em>' attribute feature.
+ /** + * The meta object literal for the '<em><b>Address</b></em>' attribute feature. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
EAttribute PERSON__ADDRESS = eINSTANCE.getPerson_Address();
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/Name.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/Name.java index 5a638f15c..0a76be604 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/Name.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/Name.java @@ -2,84 +2,84 @@ * <copyright>
* </copyright>
*
- * $Id: Name.java,v 1.2 2006/07/22 13:01:17 mtaal Exp $
+ * $Id: Name.java,v 1.3 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid;
import java.io.Serializable;
-/**
+/** * <!-- begin-user-doc -->
* A representation of the model object '<em><b>Name</b></em>'.
* <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getFirstName <em>First Name</em>}</li>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getLastName <em>Last Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#getName_()
- * @model annotation="http://annotation.elver.org/Embeddable appinfo='true'"
- * extendedMetaData="name='Name' kind='elementOnly'"
- * @extends Serializable
- * @generated
+ * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getFirstName <em>First Name</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getLastName <em>Last Name</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#getName_() + * @model annotation="teneo.jpa appinfo='@Embeddable'" + * extendedMetaData="name='Name' kind='elementOnly'" + * @extends Serializable + * @generated */
public interface Name extends Serializable {
- /**
- * Returns the value of the '<em><b>First Name</b></em>' attribute.
+ /** + * Returns the value of the '<em><b>First Name</b></em>' attribute. * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>First Name</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>First Name</em>' attribute.
- * @see #setFirstName(String)
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#getName_FirstName()
- * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
- * extendedMetaData="kind='element' name='firstName'"
- * @generated
+ * @return the value of the '<em>First Name</em>' attribute. + * @see #setFirstName(String) + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#getName_FirstName() + * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true" + * extendedMetaData="kind='element' name='firstName'" + * @generated */
- String getFirstName();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getFirstName <em>First Name</em>}' attribute.
+ String getFirstName(); + + /** + * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getFirstName <em>First Name</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>First Name</em>' attribute.
- * @see #getFirstName()
- * @generated
+ * @param value the new value of the '<em>First Name</em>' attribute. + * @see #getFirstName() + * @generated */
- void setFirstName(String value);
-
- /**
- * Returns the value of the '<em><b>Last Name</b></em>' attribute.
+ void setFirstName(String value); + + /** + * Returns the value of the '<em><b>Last Name</b></em>' attribute. * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Last Name</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Last Name</em>' attribute.
- * @see #setLastName(String)
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#getName_LastName()
- * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
- * extendedMetaData="kind='element' name='lastName'"
- * @generated
+ * @return the value of the '<em>Last Name</em>' attribute. + * @see #setLastName(String) + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#getName_LastName() + * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true" + * extendedMetaData="kind='element' name='lastName'" + * @generated */
- String getLastName();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getLastName <em>Last Name</em>}' attribute.
+ String getLastName(); + + /** + * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name#getLastName <em>Last Name</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Last Name</em>' attribute.
- * @see #getLastName()
- * @generated
+ * @param value the new value of the '<em>Last Name</em>' attribute. + * @see #getLastName() + * @generated */
- void setLastName(String value);
-
+ void setLastName(String value); + } // Name
\ No newline at end of file diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/Person.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/Person.java index 875246686..18d052311 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/Person.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/Person.java @@ -2,85 +2,85 @@ * <copyright>
* </copyright>
*
- * $Id: Person.java,v 1.2 2006/07/22 13:01:17 mtaal Exp $
+ * $Id: Person.java,v 1.3 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid;
import java.io.Serializable;
-/**
+/** * <!-- begin-user-doc -->
* A representation of the model object '<em><b>Person</b></em>'.
* <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getAddress <em>Address</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#getPerson()
- * @model extendedMetaData="name='Person' kind='elementOnly'"
- * @extends Serializable
- * @generated
+ * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getAddress <em>Address</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#getPerson() + * @model extendedMetaData="name='Person' kind='elementOnly'" + * @extends Serializable + * @generated */
public interface Person extends Serializable {
- /**
- * Returns the value of the '<em><b>Name</b></em>' containment reference.
+ /** + * Returns the value of the '<em><b>Name</b></em>' containment reference. * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Name</em>' containment reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Name</em>' containment reference.
- * @see #setName(Name)
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#getPerson_Name()
- * @model containment="true" resolveProxies="false" required="true"
- * annotation="http://annotation.elver.org/EmbeddedId appinfo='true'"
- * extendedMetaData="kind='element' name='name'"
- * @generated
+ * @return the value of the '<em>Name</em>' containment reference. + * @see #setName(Name) + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#getPerson_Name() + * @model containment="true" required="true" + * annotation="teneo.jpa appinfo='@EmbeddedId'" + * extendedMetaData="kind='element' name='name'" + * @generated */
- Name getName();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getName <em>Name</em>}' containment reference.
+ Name getName(); + + /** + * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getName <em>Name</em>}' containment reference. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Name</em>' containment reference.
- * @see #getName()
- * @generated
+ * @param value the new value of the '<em>Name</em>' containment reference. + * @see #getName() + * @generated */
- void setName(Name value);
-
- /**
- * Returns the value of the '<em><b>Address</b></em>' attribute.
+ void setName(Name value); + + /** + * Returns the value of the '<em><b>Address</b></em>' attribute. * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Address</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Address</em>' attribute.
- * @see #setAddress(String)
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#getPerson_Address()
- * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
- * annotation="http://annotation.elver.org/Lob appinfo='true'"
- * extendedMetaData="kind='element' name='address'"
- * @generated
+ * @return the value of the '<em>Address</em>' attribute. + * @see #setAddress(String) + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#getPerson_Address() + * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" + * annotation="teneo.jpa appinfo='@Lob'" + * extendedMetaData="kind='element' name='address'" + * @generated */
- String getAddress();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getAddress <em>Address</em>}' attribute.
+ String getAddress(); + + /** + * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person#getAddress <em>Address</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Address</em>' attribute.
- * @see #getAddress()
- * @generated
+ * @param value the new value of the '<em>Address</em>' attribute. + * @see #getAddress() + * @generated */
- void setAddress(String value);
-
+ void setAddress(String value); + } // Person
\ No newline at end of file diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/EmbeddedidFactoryImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/EmbeddedidFactoryImpl.java index 0bdc7feaf..52a2557f2 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/EmbeddedidFactoryImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/EmbeddedidFactoryImpl.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: EmbeddedidFactoryImpl.java,v 1.1 2006/07/11 16:57:18 mtaal Exp $
+ * $Id: EmbeddedidFactoryImpl.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl;
@@ -16,93 +16,93 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin; import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.*;
-/**
+/** * <!-- begin-user-doc -->
* An implementation of the model <b>Factory</b>.
* <!-- end-user-doc -->
- * @generated
+ * @generated */
public class EmbeddedidFactoryImpl extends EFactoryImpl implements EmbeddedidFactory {
- /**
- * Creates the default factory implementation.
+ /** + * Creates the default factory implementation. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public static EmbeddedidFactory init() {
- try {
- EmbeddedidFactory theEmbeddedidFactory = (EmbeddedidFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid");
- if (theEmbeddedidFactory != null) {
- return theEmbeddedidFactory;
- }
- }
- catch (Exception exception) {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new EmbeddedidFactoryImpl();
- }
-
- /**
- * Creates an instance of the factory.
+ public static EmbeddedidFactory init() { + try { + EmbeddedidFactory theEmbeddedidFactory = (EmbeddedidFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid"); + if (theEmbeddedidFactory != null) { + return theEmbeddedidFactory; + } + } + catch (Exception exception) { + EcorePlugin.INSTANCE.log(exception); + } + return new EmbeddedidFactoryImpl(); + } + + /** + * Creates an instance of the factory. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EmbeddedidFactoryImpl() {
- super();
- }
-
- /**
+ public EmbeddedidFactoryImpl() { + super(); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
- case EmbeddedidPackage.NAME: return (EObject)createName();
- case EmbeddedidPackage.PERSON: return (EObject)createPerson();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
- }
- }
-
- /**
+ public EObject create(EClass eClass) { + switch (eClass.getClassifierID()) { + case EmbeddedidPackage.NAME: return (EObject)createName(); + case EmbeddedidPackage.PERSON: return (EObject)createPerson(); + default: + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); + } + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public Name createName() {
- NameImpl name = new NameImpl();
- return name;
- }
-
- /**
+ public Name createName() { + NameImpl name = new NameImpl(); + return name; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public Person createPerson() {
- PersonImpl person = new PersonImpl();
- return person;
- }
-
- /**
+ public Person createPerson() { + PersonImpl person = new PersonImpl(); + return person; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EmbeddedidPackage getEmbeddedidPackage() {
- return (EmbeddedidPackage)getEPackage();
- }
-
- /**
+ public EmbeddedidPackage getEmbeddedidPackage() { + return (EmbeddedidPackage)getEPackage(); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @deprecated
- * @generated
+ * @deprecated + * @generated */
- public static EmbeddedidPackage getPackage() {
- return EmbeddedidPackage.eINSTANCE;
- }
-
+ public static EmbeddedidPackage getPackage() { + return EmbeddedidPackage.eINSTANCE; + } + } //EmbeddedidFactoryImpl
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/EmbeddedidPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/EmbeddedidPackageImpl.java index 06c334bfe..fc230bfd0 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/EmbeddedidPackageImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/EmbeddedidPackageImpl.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: EmbeddedidPackageImpl.java,v 1.1 2006/07/11 16:57:18 mtaal Exp $
+ * $Id: EmbeddedidPackageImpl.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl;
@@ -20,338 +20,314 @@ import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackag import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name;
import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person;
-/**
+/** * <!-- begin-user-doc -->
* An implementation of the model <b>Package</b>.
* <!-- end-user-doc -->
- * @generated
+ * @generated */
public class EmbeddedidPackageImpl extends EPackageImpl implements EmbeddedidPackage {
- /**
+ /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
private EClass nameEClass = null;
- /**
+ /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
private EClass personEClass = 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.
- * <p>Note: the correct way to create the package is via the static
- * factory method {@link #init init()}, which also performs
- * initialization of the package, or returns the registered package,
- * if one already exists.
+ /** + * 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. + * <p>Note: the correct way to create the package is via the static + * factory method {@link #init init()}, which also performs + * initialization of the package, or returns the registered package, + * if one already exists. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#eNS_URI
- * @see #init()
- * @generated
+ * @see org.eclipse.emf.ecore.EPackage.Registry + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage#eNS_URI + * @see #init() + * @generated */
- private EmbeddedidPackageImpl() {
- super(eNS_URI, EmbeddedidFactory.eINSTANCE);
- }
-
- /**
+ private EmbeddedidPackageImpl() { + super(eNS_URI, EmbeddedidFactory.eINSTANCE); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
private static boolean isInited = false;
- /**
- * Creates, registers, and initializes the <b>Package</b> for this
- * model, and for any others upon which it depends. Simple
- * dependencies are satisfied by calling this method on all
- * dependent packages before doing anything else. This method drives
- * initialization for interdependent packages directly, in parallel
- * with this package, itself.
- * <p>Of this package and its interdependencies, all packages which
- * have not yet been registered by their URI values are first created
- * and registered. The packages are then initialized in two steps:
- * meta-model objects for all of the packages are created before any
- * are initialized, since one package's meta-model objects may refer to
- * those of another.
- * <p>Invocation of this method will not affect any packages that have
- * already been initialized.
+ /** + * Creates, registers, and initializes the <b>Package</b> for this + * model, and for any others upon which it depends. Simple + * dependencies are satisfied by calling this method on all + * dependent packages before doing anything else. This method drives + * initialization for interdependent packages directly, in parallel + * with this package, itself. + * <p>Of this package and its interdependencies, all packages which + * have not yet been registered by their URI values are first created + * and registered. The packages are then initialized in two steps: + * meta-model objects for all of the packages are created before any + * are initialized, since one package's meta-model objects may refer to + * those of another. + * <p>Invocation of this method will not affect any packages that have + * already been initialized. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
+ * @see #eNS_URI + * @see #createPackageContents() + * @see #initializePackageContents() + * @generated */
- public static EmbeddedidPackage init() {
- if (isInited) return (EmbeddedidPackage)EPackage.Registry.INSTANCE.getEPackage(EmbeddedidPackage.eNS_URI);
-
- // Obtain or create and register package
- EmbeddedidPackageImpl theEmbeddedidPackage = (EmbeddedidPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EmbeddedidPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new EmbeddedidPackageImpl());
-
- isInited = true;
-
- // Initialize simple dependencies
- XMLTypePackage.eINSTANCE.eClass();
-
- // Create package meta-data objects
- theEmbeddedidPackage.createPackageContents();
-
- // Initialize created meta-data
- theEmbeddedidPackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theEmbeddedidPackage.freeze();
-
- return theEmbeddedidPackage;
- }
-
- /**
+ public static EmbeddedidPackage init() { + if (isInited) return (EmbeddedidPackage)EPackage.Registry.INSTANCE.getEPackage(EmbeddedidPackage.eNS_URI); + + // Obtain or create and register package + EmbeddedidPackageImpl theEmbeddedidPackage = (EmbeddedidPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EmbeddedidPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new EmbeddedidPackageImpl()); + + isInited = true; + + // Initialize simple dependencies + XMLTypePackage.eINSTANCE.eClass(); + + // Create package meta-data objects + theEmbeddedidPackage.createPackageContents(); + + // Initialize created meta-data + theEmbeddedidPackage.initializePackageContents(); + + // Mark meta-data to indicate it can't be changed + theEmbeddedidPackage.freeze(); + + return theEmbeddedidPackage; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EClass getName_() {
- return nameEClass;
- }
-
- /**
+ public EClass getName_() { + return nameEClass; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EAttribute getName_FirstName() {
- return (EAttribute)nameEClass.getEStructuralFeatures().get(0);
- }
-
- /**
+ public EAttribute getName_FirstName() { + return (EAttribute)nameEClass.getEStructuralFeatures().get(0); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EAttribute getName_LastName() {
- return (EAttribute)nameEClass.getEStructuralFeatures().get(1);
- }
-
- /**
+ public EAttribute getName_LastName() { + return (EAttribute)nameEClass.getEStructuralFeatures().get(1); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EClass getPerson() {
- return personEClass;
- }
-
- /**
+ public EClass getPerson() { + return personEClass; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EReference getPerson_Name() {
- return (EReference)personEClass.getEStructuralFeatures().get(0);
- }
-
- /**
+ public EReference getPerson_Name() { + return (EReference)personEClass.getEStructuralFeatures().get(0); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EAttribute getPerson_Address() {
- return (EAttribute)personEClass.getEStructuralFeatures().get(1);
- }
-
- /**
+ public EAttribute getPerson_Address() { + return (EAttribute)personEClass.getEStructuralFeatures().get(1); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EmbeddedidFactory getEmbeddedidFactory() {
- return (EmbeddedidFactory)getEFactoryInstance();
- }
-
- /**
+ public EmbeddedidFactory getEmbeddedidFactory() { + return (EmbeddedidFactory)getEFactoryInstance(); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
private boolean isCreated = false;
- /**
- * Creates the meta-model objects for the package. This method is
- * guarded to have no affect on any invocation but its first.
+ /** + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void createPackageContents() {
- if (isCreated) return;
- isCreated = true;
-
- // Create classes and their features
- nameEClass = createEClass(NAME);
- createEAttribute(nameEClass, NAME__FIRST_NAME);
- createEAttribute(nameEClass, NAME__LAST_NAME);
-
- personEClass = createEClass(PERSON);
- createEReference(personEClass, PERSON__NAME);
- createEAttribute(personEClass, PERSON__ADDRESS);
- }
-
- /**
+ public void createPackageContents() { + if (isCreated) return; + isCreated = true; + + // Create classes and their features + nameEClass = createEClass(NAME); + createEAttribute(nameEClass, NAME__FIRST_NAME); + createEAttribute(nameEClass, NAME__LAST_NAME); + + personEClass = createEClass(PERSON); + createEReference(personEClass, PERSON__NAME); + createEAttribute(personEClass, PERSON__ADDRESS); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
private boolean isInitialized = false;
- /**
- * Complete the initialization of the package and its meta-model. This
- * method is guarded to have no affect on any invocation but its first.
+ /** + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void initializePackageContents() {
- if (isInitialized) return;
- isInitialized = true;
-
- // Initialize package
- setName(eNAME);
- setNsPrefix(eNS_PREFIX);
- setNsURI(eNS_URI);
-
- // Obtain other dependent packages
- XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-
- // Add supertypes to classes
-
- // Initialize classes and features; add operations and parameters
- initEClass(nameEClass, Name.class, "Name", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getName_FirstName(), theXMLTypePackage.getString(), "firstName", null, 1, 1, Name.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getName_LastName(), theXMLTypePackage.getString(), "lastName", null, 1, 1, Name.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(personEClass, Person.class, "Person", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getPerson_Name(), this.getName_(), null, "name", null, 1, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPerson_Address(), theXMLTypePackage.getString(), "address", null, 0, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- // Create resource
- createResource(eNS_URI);
-
- // Create annotations
- // http://annotation.elver.org/Embeddable
- createEmbeddableAnnotations();
- // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
- createExtendedMetaDataAnnotations();
- // http://annotation.elver.org/EmbeddedId
- createEmbeddedIdAnnotations();
- // http://annotation.elver.org/Lob
- createLobAnnotations();
- }
-
- /**
- * Initializes the annotations for <b>http://annotation.elver.org/Embeddable</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void createEmbeddableAnnotations() {
- String source = "http://annotation.elver.org/Embeddable";
- addAnnotation
- (nameEClass,
- source,
- new String[] {
- "appinfo", "true"
- });
- }
-
- /**
- * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void createExtendedMetaDataAnnotations() {
- String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
- addAnnotation
- (nameEClass,
- source,
- new String[] {
- "name", "Name",
- "kind", "elementOnly"
- });
- addAnnotation
- (getName_FirstName(),
- source,
- new String[] {
- "kind", "element",
- "name", "firstName"
- });
- addAnnotation
- (getName_LastName(),
- source,
- new String[] {
- "kind", "element",
- "name", "lastName"
- });
- addAnnotation
- (personEClass,
- source,
- new String[] {
- "name", "Person",
- "kind", "elementOnly"
- });
- addAnnotation
- (getPerson_Name(),
- source,
- new String[] {
- "kind", "element",
- "name", "name"
- });
- addAnnotation
- (getPerson_Address(),
- source,
- new String[] {
- "kind", "element",
- "name", "address"
- });
- }
-
- /**
- * Initializes the annotations for <b>http://annotation.elver.org/EmbeddedId</b>.
+ public void initializePackageContents() { + if (isInitialized) return; + isInitialized = true; + + // Initialize package + setName(eNAME); + setNsPrefix(eNS_PREFIX); + setNsURI(eNS_URI); + + // Obtain other dependent packages + XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI); + + // Add supertypes to classes + + // Initialize classes and features; add operations and parameters + initEClass(nameEClass, Name.class, "Name", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getName_FirstName(), theXMLTypePackage.getString(), "firstName", null, 1, 1, Name.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getName_LastName(), theXMLTypePackage.getString(), "lastName", null, 1, 1, Name.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(personEClass, Person.class, "Person", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getPerson_Name(), this.getName_(), null, "name", null, 1, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getPerson_Address(), theXMLTypePackage.getString(), "address", null, 0, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + // Create resource + createResource(eNS_URI); + + // Create annotations + // teneo.jpa + createTeneoAnnotations(); + // http:///org/eclipse/emf/ecore/util/ExtendedMetaData + createExtendedMetaDataAnnotations(); + } + + /** + * Initializes the annotations for <b>teneo.jpa</b>. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void createTeneoAnnotations() { + String source = "teneo.jpa"; + addAnnotation + (nameEClass, + source, + new String[] { + "appinfo", "@Embeddable" + }); + addAnnotation + (getPerson_Name(), + source, + new String[] { + "appinfo", "@EmbeddedId" + }); + addAnnotation + (getPerson_Address(), + source, + new String[] { + "appinfo", "@Lob" + }); + } + + /** + * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- protected void createEmbeddedIdAnnotations() {
- String source = "http://annotation.elver.org/EmbeddedId";
- addAnnotation
- (getPerson_Name(),
- source,
- new String[] {
- "appinfo", "true"
- });
- }
-
- /**
- * Initializes the annotations for <b>http://annotation.elver.org/Lob</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void createLobAnnotations() {
- String source = "http://annotation.elver.org/Lob";
- addAnnotation
- (getPerson_Address(),
- source,
- new String[] {
- "appinfo", "true"
- });
- }
-
+ protected void createExtendedMetaDataAnnotations() { + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; + addAnnotation + (nameEClass, + source, + new String[] { + "name", "Name", + "kind", "elementOnly" + }); + addAnnotation + (getName_FirstName(), + source, + new String[] { + "kind", "element", + "name", "firstName" + }); + addAnnotation + (getName_LastName(), + source, + new String[] { + "kind", "element", + "name", "lastName" + }); + addAnnotation + (personEClass, + source, + new String[] { + "name", "Person", + "kind", "elementOnly" + }); + addAnnotation + (getPerson_Name(), + source, + new String[] { + "kind", "element", + "name", "name" + }); + addAnnotation + (getPerson_Address(), + source, + new String[] { + "kind", "element", + "name", "address" + }); + } + } //EmbeddedidPackageImpl
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/NameImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/NameImpl.java index 738ac8576..06d5ed591 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/NameImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/NameImpl.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: NameImpl.java,v 1.1 2006/07/11 16:57:18 mtaal Exp $
+ * $Id: NameImpl.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl;
@@ -16,200 +16,200 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage;
import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name;
-/**
+/** * <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Name</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl#getFirstName <em>First Name</em>}</li>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl#getLastName <em>Last Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
+ * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl#getFirstName <em>First Name</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl#getLastName <em>Last Name</em>}</li> + * </ul> + * </p> + * + * @generated */
public class NameImpl extends EObjectImpl implements Name {
- /**
- * The default value of the '{@link #getFirstName() <em>First Name</em>}' attribute.
+ /** + * The default value of the '{@link #getFirstName() <em>First Name</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getFirstName()
- * @generated
- * @ordered
+ * @see #getFirstName() + * @generated + * @ordered */
protected static final String FIRST_NAME_EDEFAULT = null;
- /**
- * The cached value of the '{@link #getFirstName() <em>First Name</em>}' attribute.
+ /** + * The cached value of the '{@link #getFirstName() <em>First Name</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getFirstName()
- * @generated
- * @ordered
+ * @see #getFirstName() + * @generated + * @ordered */
protected String firstName = FIRST_NAME_EDEFAULT;
- /**
- * The default value of the '{@link #getLastName() <em>Last Name</em>}' attribute.
+ /** + * The default value of the '{@link #getLastName() <em>Last Name</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getLastName()
- * @generated
- * @ordered
+ * @see #getLastName() + * @generated + * @ordered */
protected static final String LAST_NAME_EDEFAULT = null;
- /**
- * The cached value of the '{@link #getLastName() <em>Last Name</em>}' attribute.
+ /** + * The cached value of the '{@link #getLastName() <em>Last Name</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getLastName()
- * @generated
- * @ordered
+ * @see #getLastName() + * @generated + * @ordered */
protected String lastName = LAST_NAME_EDEFAULT;
- /**
+ /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- protected NameImpl() {
- super();
- }
-
- /**
+ protected NameImpl() { + super(); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- protected EClass eStaticClass() {
- return EmbeddedidPackage.Literals.NAME;
- }
-
- /**
+ protected EClass eStaticClass() { + return EmbeddedidPackage.Literals.NAME; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public String getFirstName() {
- return firstName;
- }
-
- /**
+ public String getFirstName() { + return firstName; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void setFirstName(String newFirstName) {
- String oldFirstName = firstName;
- firstName = newFirstName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, EmbeddedidPackage.NAME__FIRST_NAME, oldFirstName, firstName));
- }
-
- /**
+ public void setFirstName(String newFirstName) { + String oldFirstName = firstName; + firstName = newFirstName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EmbeddedidPackage.NAME__FIRST_NAME, oldFirstName, firstName)); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public String getLastName() {
- return lastName;
- }
-
- /**
+ public String getLastName() { + return lastName; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void setLastName(String newLastName) {
- String oldLastName = lastName;
- lastName = newLastName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, EmbeddedidPackage.NAME__LAST_NAME, oldLastName, lastName));
- }
-
- /**
+ public void setLastName(String newLastName) { + String oldLastName = lastName; + lastName = newLastName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EmbeddedidPackage.NAME__LAST_NAME, oldLastName, lastName)); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case EmbeddedidPackage.NAME__FIRST_NAME:
- return getFirstName();
- case EmbeddedidPackage.NAME__LAST_NAME:
- return getLastName();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
+ public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case EmbeddedidPackage.NAME__FIRST_NAME: + return getFirstName(); + case EmbeddedidPackage.NAME__LAST_NAME: + return getLastName(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case EmbeddedidPackage.NAME__FIRST_NAME:
- setFirstName((String)newValue);
- return;
- case EmbeddedidPackage.NAME__LAST_NAME:
- setLastName((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
+ public void eSet(int featureID, Object newValue) { + switch (featureID) { + case EmbeddedidPackage.NAME__FIRST_NAME: + setFirstName((String)newValue); + return; + case EmbeddedidPackage.NAME__LAST_NAME: + setLastName((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void eUnset(int featureID) {
- switch (featureID) {
- case EmbeddedidPackage.NAME__FIRST_NAME:
- setFirstName(FIRST_NAME_EDEFAULT);
- return;
- case EmbeddedidPackage.NAME__LAST_NAME:
- setLastName(LAST_NAME_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
+ public void eUnset(int featureID) { + switch (featureID) { + case EmbeddedidPackage.NAME__FIRST_NAME: + setFirstName(FIRST_NAME_EDEFAULT); + return; + case EmbeddedidPackage.NAME__LAST_NAME: + setLastName(LAST_NAME_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case EmbeddedidPackage.NAME__FIRST_NAME:
- return FIRST_NAME_EDEFAULT == null ? firstName != null : !FIRST_NAME_EDEFAULT.equals(firstName);
- case EmbeddedidPackage.NAME__LAST_NAME:
- return LAST_NAME_EDEFAULT == null ? lastName != null : !LAST_NAME_EDEFAULT.equals(lastName);
- }
- return super.eIsSet(featureID);
- }
-
- /**
+ public boolean eIsSet(int featureID) { + switch (featureID) { + case EmbeddedidPackage.NAME__FIRST_NAME: + return FIRST_NAME_EDEFAULT == null ? firstName != null : !FIRST_NAME_EDEFAULT.equals(firstName); + case EmbeddedidPackage.NAME__LAST_NAME: + return LAST_NAME_EDEFAULT == null ? lastName != null : !LAST_NAME_EDEFAULT.equals(lastName); + } + return super.eIsSet(featureID); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (firstName: ");
- result.append(firstName);
- result.append(", lastName: ");
- result.append(lastName);
- result.append(')');
- return result.toString();
- }
-
+ public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (firstName: "); + result.append(firstName); + result.append(", lastName: "); + result.append(lastName); + result.append(')'); + return result.toString(); + } + } //NameImpl
\ No newline at end of file diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/PersonImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/PersonImpl.java index bd754d8d4..86257e21b 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/PersonImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/impl/PersonImpl.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: PersonImpl.java,v 1.1 2006/07/11 16:57:18 mtaal Exp $
+ * $Id: PersonImpl.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl;
@@ -19,223 +19,223 @@ import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackag import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name;
import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person;
-/**
+/** * <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Person</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl#getAddress <em>Address</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
+ * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl#getAddress <em>Address</em>}</li> + * </ul> + * </p> + * + * @generated */
public class PersonImpl extends EObjectImpl implements Person {
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' containment reference.
+ /** + * The cached value of the '{@link #getName() <em>Name</em>}' containment reference. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
+ * @see #getName() + * @generated + * @ordered */
protected Name name = null;
- /**
- * The default value of the '{@link #getAddress() <em>Address</em>}' attribute.
+ /** + * The default value of the '{@link #getAddress() <em>Address</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getAddress()
- * @generated
- * @ordered
+ * @see #getAddress() + * @generated + * @ordered */
protected static final String ADDRESS_EDEFAULT = null;
- /**
- * The cached value of the '{@link #getAddress() <em>Address</em>}' attribute.
+ /** + * The cached value of the '{@link #getAddress() <em>Address</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getAddress()
- * @generated
- * @ordered
+ * @see #getAddress() + * @generated + * @ordered */
protected String address = ADDRESS_EDEFAULT;
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PersonImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return EmbeddedidPackage.Literals.PERSON;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Name getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetName(Name newName, NotificationChain msgs) {
- Name oldName = name;
- name = newName;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EmbeddedidPackage.PERSON__NAME, oldName, newName);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(Name newName) {
- if (newName != name) {
- NotificationChain msgs = null;
- if (name != null)
- msgs = ((InternalEObject)name).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EmbeddedidPackage.PERSON__NAME, null, msgs);
- if (newName != null)
- msgs = ((InternalEObject)newName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EmbeddedidPackage.PERSON__NAME, null, msgs);
- msgs = basicSetName(newName, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, EmbeddedidPackage.PERSON__NAME, newName, newName));
- }
-
- /**
+ /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public String getAddress() {
- return address;
- }
-
- /**
+ protected PersonImpl() { + super(); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void setAddress(String newAddress) {
- String oldAddress = address;
- address = newAddress;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, EmbeddedidPackage.PERSON__ADDRESS, oldAddress, address));
- }
-
- /**
+ protected EClass eStaticClass() { + return EmbeddedidPackage.Literals.PERSON; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case EmbeddedidPackage.PERSON__NAME:
- return basicSetName(null, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
+ public Name getName() { + return name; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case EmbeddedidPackage.PERSON__NAME:
- return getName();
- case EmbeddedidPackage.PERSON__ADDRESS:
- return getAddress();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case EmbeddedidPackage.PERSON__NAME:
- setName((Name)newValue);
- return;
- case EmbeddedidPackage.PERSON__ADDRESS:
- setAddress((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case EmbeddedidPackage.PERSON__NAME:
- setName((Name)null);
- return;
- case EmbeddedidPackage.PERSON__ADDRESS:
- setAddress(ADDRESS_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case EmbeddedidPackage.PERSON__NAME:
- return name != null;
- case EmbeddedidPackage.PERSON__ADDRESS:
- return ADDRESS_EDEFAULT == null ? address != null : !ADDRESS_EDEFAULT.equals(address);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (address: ");
- result.append(address);
- result.append(')');
- return result.toString();
- }
-
+ public NotificationChain basicSetName(Name newName, NotificationChain msgs) { + Name oldName = name; + name = newName; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EmbeddedidPackage.PERSON__NAME, oldName, newName); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated + */
+ public void setName(Name newName) { + if (newName != name) { + NotificationChain msgs = null; + if (name != null) + msgs = ((InternalEObject)name).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EmbeddedidPackage.PERSON__NAME, null, msgs); + if (newName != null) + msgs = ((InternalEObject)newName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EmbeddedidPackage.PERSON__NAME, null, msgs); + msgs = basicSetName(newName, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EmbeddedidPackage.PERSON__NAME, newName, newName)); + } + + /** + * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated + */
+ public String getAddress() { + return address; + } + + /** + * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated + */
+ public void setAddress(String newAddress) { + String oldAddress = address; + address = newAddress; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EmbeddedidPackage.PERSON__ADDRESS, oldAddress, address)); + } + + /** + * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated + */
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case EmbeddedidPackage.PERSON__NAME: + return basicSetName(null, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated + */
+ public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case EmbeddedidPackage.PERSON__NAME: + return getName(); + case EmbeddedidPackage.PERSON__ADDRESS: + return getAddress(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated + */
+ public void eSet(int featureID, Object newValue) { + switch (featureID) { + case EmbeddedidPackage.PERSON__NAME: + setName((Name)newValue); + return; + case EmbeddedidPackage.PERSON__ADDRESS: + setAddress((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated + */
+ public void eUnset(int featureID) { + switch (featureID) { + case EmbeddedidPackage.PERSON__NAME: + setName((Name)null); + return; + case EmbeddedidPackage.PERSON__ADDRESS: + setAddress(ADDRESS_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated + */
+ public boolean eIsSet(int featureID) { + switch (featureID) { + case EmbeddedidPackage.PERSON__NAME: + return name != null; + case EmbeddedidPackage.PERSON__ADDRESS: + return ADDRESS_EDEFAULT == null ? address != null : !ADDRESS_EDEFAULT.equals(address); + } + return super.eIsSet(featureID); + } + + /** + * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated + */
+ public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (address: "); + result.append(address); + result.append(')'); + return result.toString(); + } + } //PersonImpl
\ No newline at end of file diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/model/EmbeddedId.genmodel b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/model/EmbeddedId.genmodel index f282a7580..e42c38b78 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/model/EmbeddedId.genmodel +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/model/EmbeddedId.genmodel @@ -1,19 +1,19 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.teneo.samples/src"
- modelPluginID="org.eclipse.emf.teneo.samples" modelName="EmbeddedId" rootExtendsInterface="java.io.Serializable"
- rootImplementsInterface="" importerID="org.eclipse.xsd.ecore.importer">
- <foreignModel>EmbeddedId.xsd</foreignModel>
- <genPackages prefix="Embeddedid" basePackage="org.eclipse.emf.teneo.samples.emf.annotations"
- resource="XML" disposableProviderFactory="true" ecorePackage="embeddedid.ecore#/">
- <genClasses ecoreClass="embeddedid.ecore#//Name">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute embeddedid.ecore#//Name/firstName"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute embeddedid.ecore#//Name/lastName"/>
- </genClasses>
- <genClasses ecoreClass="embeddedid.ecore#//Person">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference embeddedid.ecore#//Person/name"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute embeddedid.ecore#//Person/address"/>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-8"?> +<genmodel:GenModel xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" + xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.teneo.samples/src" + modelPluginID="org.eclipse.emf.teneo.samples" modelName="EmbeddedId" rootExtendsInterface="java.io.Serializable" + rootImplementsInterface="" importerID="org.eclipse.xsd.ecore.importer"> + <foreignModel>EmbeddedId.xsd</foreignModel> + <genPackages prefix="Embeddedid" basePackage="org.eclipse.emf.teneo.samples.emf.annotations" + resource="XML" disposableProviderFactory="true" ecorePackage="embeddedid.ecore#/"> + <genClasses ecoreClass="embeddedid.ecore#//Name"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute embeddedid.ecore#//Name/firstName"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute embeddedid.ecore#//Name/lastName"/> + </genClasses> + <genClasses ecoreClass="embeddedid.ecore#//Person"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference embeddedid.ecore#//Person/name"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute embeddedid.ecore#//Person/address"/> + </genClasses> + </genPackages> +</genmodel:GenModel> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/model/EmbeddedId.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/model/EmbeddedId.xsd index debad692d..09321ea87 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/model/EmbeddedId.xsd +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/model/EmbeddedId.xsd @@ -6,12 +6,12 @@ <xsd:sequence>
<xsd:element name="name" type="this:Name">
<xsd:annotation>
- <xsd:appinfo source="http://annotation.elver.org/EmbeddedId">true</xsd:appinfo>
+ <xsd:appinfo source="teneo.jpa">@EmbeddedId</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="address" type="xsd:string" minOccurs="0">
<xsd:annotation>
- <xsd:appinfo source="http://annotation.elver.org/Lob">true</xsd:appinfo>
+ <xsd:appinfo source="teneo.jpa">@Lob</xsd:appinfo>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
@@ -19,7 +19,7 @@ <xsd:complexType name="Name">
<xsd:annotation>
- <xsd:appinfo source="http://annotation.elver.org/Embeddable">true</xsd:appinfo>
+ <xsd:appinfo source="teneo.jpa">@Embeddable</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="firstName" type="xsd:string"/>
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/model/embeddedid.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/model/embeddedid.ecore index 1946d9b17..436e75761 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/model/embeddedid.ecore +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/model/embeddedid.ecore @@ -1,55 +1,55 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="embeddedid"
- nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid" nsPrefix="embeddedid">
- <eClassifiers xsi:type="ecore:EClass" name="Name">
- <eAnnotations source="http://annotation.elver.org/Embeddable">
- <details key="appinfo" value="true"/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="Name"/>
- <details key="kind" value="elementOnly"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="firstName" unique="false"
- lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="firstName"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastName" unique="false"
- lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="lastName"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Person">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="Person"/>
- <details key="kind" value="elementOnly"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="name" lowerBound="1" eType="#//Name"
- containment="true" resolveProxies="false">
- <eAnnotations source="http://annotation.elver.org/EmbeddedId">
- <details key="appinfo" value="true"/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="name"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="address" unique="false"
- eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
- <eAnnotations source="http://annotation.elver.org/Lob">
- <details key="appinfo" value="true"/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="address"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?> +<ecore:EPackage xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="embeddedid" + nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid" nsPrefix="embeddedid"> + <eClassifiers xsi:type="ecore:EClass" name="Name"> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Embeddable"/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value="Name"/> + <details key="kind" value="elementOnly"/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="firstName" unique="false" + lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="firstName"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastName" unique="false" + lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="lastName"/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="Person"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value="Person"/> + <details key="kind" value="elementOnly"/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EReference" name="name" lowerBound="1" eType="#//Name" + containment="true" resolveProxies="false"> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@EmbeddedId"/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="name"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="address" unique="false" + eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Lob"/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="address"/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> +</ecore:EPackage> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidAdapterFactory.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidAdapterFactory.java index 3ad6344d9..a458c9ad1 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidAdapterFactory.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidAdapterFactory.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: EmbeddedidAdapterFactory.java,v 1.1 2006/07/11 16:57:01 mtaal Exp $
+ * $Id: EmbeddedidAdapterFactory.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.util;
@@ -15,123 +15,123 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.*;
-/**
+/** * <!-- begin-user-doc -->
* The <b>Adapter Factory</b> for the model.
* It provides an adapter <code>createXXX</code> method for each class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage + * @generated */
public class EmbeddedidAdapterFactory extends AdapterFactoryImpl {
- /**
- * The cached model package.
+ /** + * The cached model package. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
protected static EmbeddedidPackage modelPackage;
- /**
- * Creates an instance of the adapter factory.
+ /** + * Creates an instance of the adapter factory. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EmbeddedidAdapterFactory() {
- if (modelPackage == null) {
- modelPackage = EmbeddedidPackage.eINSTANCE;
- }
- }
-
- /**
- * Returns whether this factory is applicable for the type of the object.
+ public EmbeddedidAdapterFactory() { + if (modelPackage == null) { + modelPackage = EmbeddedidPackage.eINSTANCE; + } + } + + /** + * Returns whether this factory is applicable for the type of the object. * <!-- begin-user-doc -->
* This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
* <!-- end-user-doc -->
- * @return whether this factory is applicable for the type of the object.
- * @generated
+ * @return whether this factory is applicable for the type of the object. + * @generated */
- public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
- return true;
- }
- if (object instanceof EObject) {
- return ((EObject)object).eClass().getEPackage() == modelPackage;
- }
- return false;
- }
-
- /**
- * The switch the delegates to the <code>createXXX</code> methods.
+ public boolean isFactoryForType(Object object) { + if (object == modelPackage) { + return true; + } + if (object instanceof EObject) { + return ((EObject)object).eClass().getEPackage() == modelPackage; + } + return false; + } + + /** + * The switch the delegates to the <code>createXXX</code> methods. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- protected EmbeddedidSwitch modelSwitch =
- new EmbeddedidSwitch() {
- public Object caseName(Name object) {
- return createNameAdapter();
- }
- public Object casePerson(Person object) {
- return createPersonAdapter();
- }
- public Object defaultCase(EObject object) {
- return createEObjectAdapter();
- }
+ protected EmbeddedidSwitch modelSwitch = + new EmbeddedidSwitch() { + public Object caseName(Name object) { + return createNameAdapter(); + } + public Object casePerson(Person object) { + return createPersonAdapter(); + } + public Object defaultCase(EObject object) { + return createEObjectAdapter(); + } };
- /**
- * Creates an adapter for the <code>target</code>.
+ /** + * Creates an adapter for the <code>target</code>. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param target the object to adapt.
- * @return the adapter for the <code>target</code>.
- * @generated
+ * @param target the object to adapt. + * @return the adapter for the <code>target</code>. + * @generated */
- public Adapter createAdapter(Notifier target) {
- return (Adapter)modelSwitch.doSwitch((EObject)target);
- }
-
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name <em>Name</em>}'.
+ public Adapter createAdapter(Notifier target) { + return (Adapter)modelSwitch.doSwitch((EObject)target); + } + + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name <em>Name</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.emf.teneo.samples.emf.annotations.embeddedid.Name
- * @generated
+ * @return the new adapter. + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Name + * @generated */
- public Adapter createNameAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person <em>Person</em>}'.
+ public Adapter createNameAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person <em>Person</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.emf.teneo.samples.emf.annotations.embeddedid.Person
- * @generated
+ * @return the new adapter. + * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.Person + * @generated */
- public Adapter createPersonAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for the default case.
+ public Adapter createPersonAdapter() { + return null; + } + + /** + * Creates a new adapter for the default case. * <!-- begin-user-doc -->
* This default implementation returns null.
* <!-- end-user-doc -->
- * @return the new adapter.
- * @generated
+ * @return the new adapter. + * @generated */
- public Adapter createEObjectAdapter() {
- return null;
- }
-
+ public Adapter createEObjectAdapter() { + return null; + } + } //EmbeddedidAdapterFactory
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidResourceFactoryImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidResourceFactoryImpl.java index 98f621836..4e0d73f93 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidResourceFactoryImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidResourceFactoryImpl.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: EmbeddedidResourceFactoryImpl.java,v 1.1 2006/07/11 16:57:01 mtaal Exp $
+ * $Id: EmbeddedidResourceFactoryImpl.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.util;
@@ -14,42 +14,42 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl; import org.eclipse.emf.ecore.xmi.XMLResource;
-/**
+/** * <!-- begin-user-doc -->
* The <b>Resource Factory</b> associated with the package.
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.util.EmbeddedidResourceImpl
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.util.EmbeddedidResourceImpl + * @generated */
public class EmbeddedidResourceFactoryImpl extends ResourceFactoryImpl {
- /**
- * Creates an instance of the resource factory.
+ /** + * Creates an instance of the resource factory. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EmbeddedidResourceFactoryImpl() {
- super();
- }
-
- /**
- * Creates an instance of the resource.
+ public EmbeddedidResourceFactoryImpl() { + super(); + } + + /** + * Creates an instance of the resource. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public Resource createResource(URI uri) {
- XMLResource result = new EmbeddedidResourceImpl(uri);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
- result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-
- result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-
- result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-
- result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
- return result;
- }
-
+ public Resource createResource(URI uri) { + XMLResource result = new EmbeddedidResourceImpl(uri); + result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE); + result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE); + + result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE); + + result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE); + result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE); + + result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE); + return result; + } + } //EmbeddedidResourceFactoryImpl
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidResourceImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidResourceImpl.java index 3c67c9331..d21db3c3c 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidResourceImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidResourceImpl.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: EmbeddedidResourceImpl.java,v 1.1 2006/07/11 16:57:01 mtaal Exp $
+ * $Id: EmbeddedidResourceImpl.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.util;
@@ -10,23 +10,23 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-/**
+/** * <!-- begin-user-doc -->
* The <b>Resource </b> associated with the package.
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.util.EmbeddedidResourceFactoryImpl
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.util.EmbeddedidResourceFactoryImpl + * @generated */
public class EmbeddedidResourceImpl extends XMLResourceImpl {
- /**
- * Creates an instance of the resource.
+ /** + * Creates an instance of the resource. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param uri the URI of the new resource.
- * @generated
+ * @param uri the URI of the new resource. + * @generated */
- public EmbeddedidResourceImpl(URI uri) {
- super(uri);
- }
-
+ public EmbeddedidResourceImpl(URI uri) { + super(uri); + } + } //EmbeddedidResourceImpl
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidSwitch.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidSwitch.java index 11cb1e0fc..5264f569b 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidSwitch.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidSwitch.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: EmbeddedidSwitch.java,v 1.1 2006/07/11 16:57:01 mtaal Exp $
+ * $Id: EmbeddedidSwitch.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.util;
@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.*;
-/**
+/** * <!-- begin-user-doc -->
* The <b>Switch</b> for the model's inheritance hierarchy.
* It supports the call {@link #doSwitch(EObject) doSwitch(object)}
@@ -23,129 +23,129 @@ import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.*; * until a non-null result is returned,
* which is the result of the switch.
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage + * @generated */
public class EmbeddedidSwitch {
- /**
- * The cached model package
+ /** + * The cached model package * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
protected static EmbeddedidPackage modelPackage;
- /**
- * Creates an instance of the switch.
+ /** + * Creates an instance of the switch. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EmbeddedidSwitch() {
- if (modelPackage == null) {
- modelPackage = EmbeddedidPackage.eINSTANCE;
- }
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+ public EmbeddedidSwitch() { + if (modelPackage == null) { + modelPackage = EmbeddedidPackage.eINSTANCE; + } + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
+ * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated */
- public Object doSwitch(EObject theEObject) {
- return doSwitch(theEObject.eClass(), theEObject);
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+ public Object doSwitch(EObject theEObject) { + return doSwitch(theEObject.eClass(), theEObject); + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
+ * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated */
- protected Object doSwitch(EClass theEClass, EObject theEObject) {
- if (theEClass.eContainer() == modelPackage) {
- return doSwitch(theEClass.getClassifierID(), theEObject);
- }
- else {
- List eSuperTypes = theEClass.getESuperTypes();
- return
- eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch((EClass)eSuperTypes.get(0), theEObject);
- }
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+ protected Object doSwitch(EClass theEClass, EObject theEObject) { + if (theEClass.eContainer() == modelPackage) { + return doSwitch(theEClass.getClassifierID(), theEObject); + } + else { + List eSuperTypes = theEClass.getESuperTypes(); + return + eSuperTypes.isEmpty() ? + defaultCase(theEObject) : + doSwitch((EClass)eSuperTypes.get(0), theEObject); + } + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
+ * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated */
- protected Object doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case EmbeddedidPackage.NAME: {
- Name name = (Name)theEObject;
- Object result = caseName(name);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case EmbeddedidPackage.PERSON: {
- Person person = (Person)theEObject;
- Object result = casePerson(person);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default: return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Name</em>'.
+ protected Object doSwitch(int classifierID, EObject theEObject) { + switch (classifierID) { + case EmbeddedidPackage.NAME: { + Name name = (Name)theEObject; + Object result = caseName(name); + if (result == null) result = defaultCase(theEObject); + return result; + } + case EmbeddedidPackage.PERSON: { + Person person = (Person)theEObject; + Object result = casePerson(person); + if (result == null) result = defaultCase(theEObject); + return result; + } + default: return defaultCase(theEObject); + } + } + + /** + * Returns the result of interpretting the object as an instance of '<em>Name</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>Name</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
+ * @param object the target of the switch. + * @return the result of interpretting the object as an instance of '<em>Name</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated */
- public Object caseName(Name object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Person</em>'.
+ public Object caseName(Name object) { + return null; + } + + /** + * Returns the result of interpretting the object as an instance of '<em>Person</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>Person</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
+ * @param object the target of the switch. + * @return the result of interpretting the object as an instance of '<em>Person</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated */
- public Object casePerson(Person object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
+ public Object casePerson(Person object) { + return null; + } + + /** + * Returns the result of interpretting the object as an instance of '<em>EObject</em>'. * <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch, but this is the last case anyway.
* <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject)
- * @generated
+ * @param object the target of the switch. + * @return the result of interpretting the object as an instance of '<em>EObject</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) + * @generated */
- public Object defaultCase(EObject object) {
- return null;
- }
-
+ public Object defaultCase(EObject object) { + return null; + } + } //EmbeddedidSwitch
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidXMLProcessor.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidXMLProcessor.java index 56e3e0ac8..25978ce77 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidXMLProcessor.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/embeddedid/util/EmbeddedidXMLProcessor.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: EmbeddedidXMLProcessor.java,v 1.1 2006/07/11 16:57:01 mtaal Exp $
+ * $Id: EmbeddedidXMLProcessor.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.util;
@@ -14,37 +14,37 @@ import org.eclipse.emf.ecore.xmi.util.XMLProcessor; import org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.EmbeddedidPackage;
-/**
- * This class contains helper methods to serialize and deserialize XML documents
+/** + * This class contains helper methods to serialize and deserialize XML documents * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
public class EmbeddedidXMLProcessor extends XMLProcessor {
- /**
- * Public constructor to instantiate the helper.
+ /** + * Public constructor to instantiate the helper. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EmbeddedidXMLProcessor() {
- super((EPackage.Registry.INSTANCE));
- EmbeddedidPackage.eINSTANCE.eClass();
- }
-
- /**
- * Register for "*" and "xml" file extensions the EmbeddedidResourceFactoryImpl factory.
+ public EmbeddedidXMLProcessor() { + super((EPackage.Registry.INSTANCE)); + EmbeddedidPackage.eINSTANCE.eClass(); + } + + /** + * Register for "*" and "xml" file extensions the EmbeddedidResourceFactoryImpl factory. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- protected Map getRegistrations() {
- if (registrations == null) {
- super.getRegistrations();
- registrations.put(XML_EXTENSION, new EmbeddedidResourceFactoryImpl());
- registrations.put(STAR_EXTENSION, new EmbeddedidResourceFactoryImpl());
- }
- return registrations;
- }
-
+ protected Map getRegistrations() { + if (registrations == null) { + super.getRegistrations(); + registrations.put(XML_EXTENSION, new EmbeddedidResourceFactoryImpl()); + registrations.put(STAR_EXTENSION, new EmbeddedidResourceFactoryImpl()); + } + return registrations; + } + } //EmbeddedidXMLProcessor
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/Child.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/Child.java index cecf4845d..40305aa36 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/Child.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/Child.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Child.java,v 1.1 2006/07/11 16:56:55 mtaal Exp $ + * $Id: Child.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns; @@ -13,9 +13,9 @@ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns; * <!-- end-user-doc --> * * - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.CompositeidPackage#getChild() + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage#getChild() * @model * @generated */ public interface Child extends Person { -} // Child +} // Child
\ No newline at end of file diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/CompositeidFactory.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/JoincolumnsFactory.java index 25276d1f8..fd4f21075 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/CompositeidFactory.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/JoincolumnsFactory.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: CompositeidFactory.java,v 1.1 2006/07/11 16:56:55 mtaal Exp $ + * $Id: JoincolumnsFactory.java,v 1.1 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns; @@ -13,17 +13,17 @@ import org.eclipse.emf.ecore.EFactory; * The <b>Factory</b> for the model. * It provides a create method for each non-abstract class of the model. * <!-- end-user-doc --> - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.CompositeidPackage + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage * @generated */ -public interface CompositeidFactory extends EFactory { +public interface JoincolumnsFactory extends EFactory { /** * The singleton instance of the factory. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - CompositeidFactory eINSTANCE = org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.CompositeidFactoryImpl.init(); + JoincolumnsFactory eINSTANCE = org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.JoincolumnsFactoryImpl.init(); /** * Returns a new object of class '<em>Parent</em>'. @@ -59,6 +59,6 @@ public interface CompositeidFactory extends EFactory { * @return the package supported by this factory. * @generated */ - CompositeidPackage getCompositeidPackage(); + JoincolumnsPackage getJoincolumnsPackage(); -} //CompositeidFactory +} //JoincolumnsFactory diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/CompositeidPackage.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/JoincolumnsPackage.java index 69b006c86..efa43f056 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/CompositeidPackage.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/JoincolumnsPackage.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: CompositeidPackage.java,v 1.1 2006/07/11 16:56:55 mtaal Exp $ + * $Id: JoincolumnsPackage.java,v 1.1 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns; @@ -22,18 +22,18 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.CompositeidFactory + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsFactory * @model kind="package" * @generated */ -public interface CompositeidPackage extends EPackage { +public interface JoincolumnsPackage extends EPackage { /** * The package name. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - String eNAME = "compositeid"; + String eNAME = "joincolumns"; /** * The package namespace URI. @@ -41,7 +41,7 @@ public interface CompositeidPackage extends EPackage { * <!-- end-user-doc --> * @generated */ - String eNS_URI = "http:///org/elver/samples/emf/annotations/jc.ecore"; + String eNS_URI = "http://www.eclipse.org/emf/teneo/samples/emf/annotations/joincolumns"; /** * The package namespace name. @@ -49,7 +49,7 @@ public interface CompositeidPackage extends EPackage { * <!-- end-user-doc --> * @generated */ - String eNS_PREFIX = "org.eclipse.emf.teneo.samples.emf.annotations.joincolumns"; + String eNS_PREFIX = "joincolumns"; /** * The singleton instance of the package. @@ -57,14 +57,14 @@ public interface CompositeidPackage extends EPackage { * <!-- end-user-doc --> * @generated */ - CompositeidPackage eINSTANCE = org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.CompositeidPackageImpl.init(); + JoincolumnsPackage eINSTANCE = org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.JoincolumnsPackageImpl.init(); /** * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.PersonImpl <em>Person</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.PersonImpl - * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.CompositeidPackageImpl#getPerson() + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.JoincolumnsPackageImpl#getPerson() * @generated */ int PERSON = 2; @@ -101,7 +101,7 @@ public interface CompositeidPackage extends EPackage { * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.ParentImpl - * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.CompositeidPackageImpl#getParent() + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.JoincolumnsPackageImpl#getParent() * @generated */ int PARENT = 0; @@ -147,7 +147,7 @@ public interface CompositeidPackage extends EPackage { * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.ChildImpl - * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.CompositeidPackageImpl#getChild() + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.JoincolumnsPackageImpl#getChild() * @generated */ int CHILD = 1; @@ -181,63 +181,63 @@ public interface CompositeidPackage extends EPackage { /** - * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Parent <em>Parent</em>}'. + * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent <em>Parent</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Parent</em>'. - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.Parent + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent * @generated */ EClass getParent(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Parent#getChildren <em>Children</em>}'. + * Returns the meta object for the reference list '{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent#getChildren <em>Children</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the reference list '<em>Children</em>'. - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.Parent#getChildren() + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent#getChildren() * @see #getParent() * @generated */ EReference getParent_Children(); /** - * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Child <em>Child</em>}'. + * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Child <em>Child</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Child</em>'. - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.Child + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Child * @generated */ EClass getChild(); /** - * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Person <em>Person</em>}'. + * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person <em>Person</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Person</em>'. - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.Person + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person * @generated */ EClass getPerson(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Person#getFirstName <em>First Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person#getFirstName <em>First Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>First Name</em>'. - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.Person#getFirstName() + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person#getFirstName() * @see #getPerson() * @generated */ EAttribute getPerson_FirstName(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Person#getLastName <em>Last Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person#getLastName <em>Last Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Last Name</em>'. - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.Person#getLastName() + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person#getLastName() * @see #getPerson() * @generated */ @@ -250,7 +250,7 @@ public interface CompositeidPackage extends EPackage { * @return the factory that creates the instances of the model. * @generated */ - CompositeidFactory getCompositeidFactory(); + JoincolumnsFactory getJoincolumnsFactory(); /** * <!-- begin-user-doc --> @@ -270,7 +270,7 @@ public interface CompositeidPackage extends EPackage { * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.ParentImpl - * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.CompositeidPackageImpl#getParent() + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.JoincolumnsPackageImpl#getParent() * @generated */ EClass PARENT = eINSTANCE.getParent(); @@ -288,7 +288,7 @@ public interface CompositeidPackage extends EPackage { * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.ChildImpl - * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.CompositeidPackageImpl#getChild() + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.JoincolumnsPackageImpl#getChild() * @generated */ EClass CHILD = eINSTANCE.getChild(); @@ -298,7 +298,7 @@ public interface CompositeidPackage extends EPackage { * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.PersonImpl - * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.CompositeidPackageImpl#getPerson() + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.JoincolumnsPackageImpl#getPerson() * @generated */ EClass PERSON = eINSTANCE.getPerson(); @@ -321,4 +321,4 @@ public interface CompositeidPackage extends EPackage { } -} //CompositeidPackage +} //JoincolumnsPackage diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/Parent.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/Parent.java index 6f2cc2555..cccb045ac 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/Parent.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/Parent.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Parent.java,v 1.1 2006/07/11 16:56:55 mtaal Exp $ + * $Id: Parent.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns; @@ -16,18 +16,18 @@ import org.eclipse.emf.common.util.EList; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Parent#getChildren <em>Children</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent#getChildren <em>Children</em>}</li> * </ul> * </p> * - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.CompositeidPackage#getParent() + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage#getParent() * @model * @generated */ public interface Parent extends Person { /** * Returns the value of the '<em><b>Children</b></em>' reference list. - * The list contents are of type {@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Child}. + * The list contents are of type {@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Child}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Children</em>' reference list isn't clear, @@ -35,14 +35,11 @@ public interface Parent extends Person { * </p> * <!-- end-user-doc --> * @return the value of the '<em>Children</em>' reference list. - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.CompositeidPackage#getParent_Children() - * @model type="compositeid.Child" - * annotation="http://annotation.elver.org/JoinColumns value='jc1 jc2'" - * annotation="http://annotation.elver.org/JoinColumn/jc1 name='myParentFirstName' referencedColumnName='firstName'" - * annotation="http://annotation.elver.org/JoinColumn/jc2 name='myParentLastName' referencedColumnName='lastName'" - * annotation="http://annotation.elver.org/OrderBy value='firstName'" + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage#getParent_Children() + * @model type="joincolumns.Child" + * annotation="teneo.jpa appinfo='@JoinColumns({@JoinColumn(name=\"myParentFirstName\" referencedColumnName=\"firstName\"),\n\t@JoinColumn(name=\"myParentLastName\" referencedColumnName=\"lastName\")})\n\t@OrderBy(\"firstName\")'" * @generated */ EList getChildren(); -} // Parent +} // Parent
\ No newline at end of file diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/Person.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/Person.java index bd60ab17f..5dc1ba614 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/Person.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/Person.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Person.java,v 1.1 2006/07/11 16:56:55 mtaal Exp $ + * $Id: Person.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns; @@ -16,13 +16,13 @@ import org.eclipse.emf.ecore.EObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Person#getFirstName <em>First Name</em>}</li> - * <li>{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Person#getLastName <em>Last Name</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person#getFirstName <em>First Name</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person#getLastName <em>Last Name</em>}</li> * </ul> * </p> * - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.CompositeidPackage#getPerson() - * @model annotation="http://annotation.elver.org/IdClass value='org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID'" + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage#getPerson() + * @model annotation="teneo.jpa appinfo='@IdClass(org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID)'" * @generated */ public interface Person extends EObject { @@ -36,14 +36,14 @@ public interface Person extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>First Name</em>' attribute. * @see #setFirstName(String) - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.CompositeidPackage#getPerson_FirstName() - * @model + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage#getPerson_FirstName() + * @model annotation="teneo.jpa appinfo='@Id'" * @generated */ String getFirstName(); /** - * Sets the value of the '{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Person#getFirstName <em>First Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person#getFirstName <em>First Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>First Name</em>' attribute. @@ -62,14 +62,14 @@ public interface Person extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Last Name</em>' attribute. * @see #setLastName(String) - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.CompositeidPackage#getPerson_LastName() - * @model + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage#getPerson_LastName() + * @model annotation="teneo.jpa appinfo='@Id'" * @generated */ String getLastName(); /** - * Sets the value of the '{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Person#getLastName <em>Last Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person#getLastName <em>Last Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Last Name</em>' attribute. @@ -78,4 +78,4 @@ public interface Person extends EObject { */ void setLastName(String value); -} // Person +} // Person
\ No newline at end of file diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/ChildImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/ChildImpl.java index ab3ae1dc4..fe41eca77 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/ChildImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/ChildImpl.java @@ -2,14 +2,14 @@ * <copyright> * </copyright> * - * $Id: ChildImpl.java,v 1.1 2006/07/11 16:57:07 mtaal Exp $ + * $Id: ChildImpl.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Child; -import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.CompositeidPackage; +import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage; /** * <!-- begin-user-doc --> @@ -36,7 +36,7 @@ public class ChildImpl extends PersonImpl implements Child { * @generated */ protected EClass eStaticClass() { - return CompositeidPackage.Literals.CHILD; + return JoincolumnsPackage.Literals.CHILD; } -} //ChildImpl +} //ChildImpl
\ No newline at end of file diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/CompositeidFactoryImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/JoincolumnsFactoryImpl.java index 5a113bebf..de970c8c2 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/CompositeidFactoryImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/JoincolumnsFactoryImpl.java @@ -2,19 +2,18 @@ * <copyright> * </copyright> * - * $Id: CompositeidFactoryImpl.java,v 1.1 2006/07/11 16:57:07 mtaal Exp $ + * $Id: JoincolumnsFactoryImpl.java,v 1.1 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.impl.EFactoryImpl; import org.eclipse.emf.ecore.plugin.EcorePlugin; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Child; -import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.CompositeidFactory; -import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.CompositeidPackage; +import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsFactory; +import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person; @@ -24,24 +23,24 @@ import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person; * <!-- end-user-doc --> * @generated */ -public class CompositeidFactoryImpl extends EFactoryImpl implements CompositeidFactory { +public class JoincolumnsFactoryImpl extends EFactoryImpl implements JoincolumnsFactory { /** * Creates the default factory implementation. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - public static CompositeidFactory init() { + public static JoincolumnsFactory init() { try { - CompositeidFactory theCompositeidFactory = (CompositeidFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org/elver/samples/emf/annotations/jc.ecore"); - if (theCompositeidFactory != null) { - return theCompositeidFactory; + JoincolumnsFactory theJoincolumnsFactory = (JoincolumnsFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/teneo/samples/emf/annotations/joincolumns"); + if (theJoincolumnsFactory != null) { + return theJoincolumnsFactory; } } catch (Exception exception) { EcorePlugin.INSTANCE.log(exception); } - return new CompositeidFactoryImpl(); + return new JoincolumnsFactoryImpl(); } /** @@ -50,7 +49,7 @@ public class CompositeidFactoryImpl extends EFactoryImpl implements CompositeidF * <!-- end-user-doc --> * @generated */ - public CompositeidFactoryImpl() { + public JoincolumnsFactoryImpl() { super(); } @@ -61,9 +60,9 @@ public class CompositeidFactoryImpl extends EFactoryImpl implements CompositeidF */ public EObject create(EClass eClass) { switch (eClass.getClassifierID()) { - case CompositeidPackage.PARENT: return createParent(); - case CompositeidPackage.CHILD: return createChild(); - case CompositeidPackage.PERSON: return createPerson(); + case JoincolumnsPackage.PARENT: return createParent(); + case JoincolumnsPackage.CHILD: return createChild(); + case JoincolumnsPackage.PERSON: return createPerson(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } @@ -104,8 +103,8 @@ public class CompositeidFactoryImpl extends EFactoryImpl implements CompositeidF * <!-- end-user-doc --> * @generated */ - public CompositeidPackage getCompositeidPackage() { - return (CompositeidPackage)getEPackage(); + public JoincolumnsPackage getJoincolumnsPackage() { + return (JoincolumnsPackage)getEPackage(); } /** @@ -114,8 +113,8 @@ public class CompositeidFactoryImpl extends EFactoryImpl implements CompositeidF * @deprecated * @generated */ - public static CompositeidPackage getPackage() { - return CompositeidPackage.eINSTANCE; + public static JoincolumnsPackage getPackage() { + return JoincolumnsPackage.eINSTANCE; } -} //CompositeidFactoryImpl +} //JoincolumnsFactoryImpl diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/CompositeidPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/JoincolumnsPackageImpl.java index 6474a96ac..cf66f447b 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/CompositeidPackageImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/JoincolumnsPackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: CompositeidPackageImpl.java,v 1.2 2006/09/04 15:42:25 mtaal Exp $ + * $Id: JoincolumnsPackageImpl.java,v 1.1 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl; @@ -11,10 +11,11 @@ import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; + import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Child; -import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.CompositeidFactory; -import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.CompositeidPackage; +import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsFactory; +import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person; @@ -24,7 +25,7 @@ import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person; * <!-- end-user-doc --> * @generated */ -public class CompositeidPackageImpl extends EPackageImpl implements CompositeidPackage { +public class JoincolumnsPackageImpl extends EPackageImpl implements JoincolumnsPackage { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -57,12 +58,12 @@ public class CompositeidPackageImpl extends EPackageImpl implements CompositeidP * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.ecore.EPackage.Registry - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.CompositeidPackage#eNS_URI + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage#eNS_URI * @see #init() * @generated */ - private CompositeidPackageImpl() { - super(eNS_URI, CompositeidFactory.eINSTANCE); + private JoincolumnsPackageImpl() { + super(eNS_URI, JoincolumnsFactory.eINSTANCE); } /** @@ -94,24 +95,24 @@ public class CompositeidPackageImpl extends EPackageImpl implements CompositeidP * @see #initializePackageContents() * @generated */ - public static CompositeidPackage init() { - if (isInited) return (CompositeidPackage)EPackage.Registry.INSTANCE.getEPackage(CompositeidPackage.eNS_URI); + public static JoincolumnsPackage init() { + if (isInited) return (JoincolumnsPackage)EPackage.Registry.INSTANCE.getEPackage(JoincolumnsPackage.eNS_URI); // Obtain or create and register package - CompositeidPackageImpl theCompositeidPackage = (CompositeidPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof CompositeidPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new CompositeidPackageImpl()); + JoincolumnsPackageImpl theJoincolumnsPackage = (JoincolumnsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof JoincolumnsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new JoincolumnsPackageImpl()); isInited = true; // Create package meta-data objects - theCompositeidPackage.createPackageContents(); + theJoincolumnsPackage.createPackageContents(); // Initialize created meta-data - theCompositeidPackage.initializePackageContents(); + theJoincolumnsPackage.initializePackageContents(); // Mark meta-data to indicate it can't be changed - theCompositeidPackage.freeze(); + theJoincolumnsPackage.freeze(); - return theCompositeidPackage; + return theJoincolumnsPackage; } /** @@ -173,8 +174,8 @@ public class CompositeidPackageImpl extends EPackageImpl implements CompositeidP * <!-- end-user-doc --> * @generated */ - public CompositeidFactory getCompositeidFactory() { - return (CompositeidFactory)getEFactoryInstance(); + public JoincolumnsFactory getJoincolumnsFactory() { + return (JoincolumnsFactory)getEFactoryInstance(); } /** @@ -247,102 +248,42 @@ public class CompositeidPackageImpl extends EPackageImpl implements CompositeidP createResource(eNS_URI); // Create annotations - // http://annotation.elver.org/JoinColumn/jc1 - createJc1Annotations(); - // http://annotation.elver.org/JoinColumn/jc2 - createJc2Annotations(); - // http://annotation.elver.org/OrderBy - createOrderByAnnotations(); - // http://annotation.elver.org/IdClass - createIdClassAnnotations(); - // http://annotation.elver.org/Id - createIdAnnotations(); - } - - /** - * Initializes the annotations for <b>http://annotation.elver.org/JoinColumn/jc1</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void createJc1Annotations() { - String source = "http://annotation.elver.org/JoinColumn"; - addAnnotation - (getParent_Children(), - source, - new String[] { - "name", "myParentFirstName", - "referencedColumnName", "firstName" - }); - } - - /** - * Initializes the annotations for <b>http://annotation.elver.org/JoinColumn/jc2</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void createJc2Annotations() { - String source = "http://annotation.elver.org/JoinColumn"; - addAnnotation - (getParent_Children(), - source, - new String[] { - "name", "myParentLastName", - "referencedColumnName", "lastName" - }); + // teneo.jpa + createTeneoAnnotations(); } /** - * Initializes the annotations for <b>http://annotation.elver.org/OrderBy</b>. + * Initializes the annotations for <b>teneo.jpa</b>. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected void createOrderByAnnotations() { - String source = "http://annotation.elver.org/OrderBy"; + protected void createTeneoAnnotations() { + String source = "teneo.jpa"; addAnnotation (getParent_Children(), source, new String[] { - "value", "firstName" - }); - } - - /** - * Initializes the annotations for <b>http://annotation.elver.org/IdClass</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void createIdClassAnnotations() { - String source = "http://annotation.elver.org/IdClass"; + "appinfo", "@JoinColumns({@JoinColumn(name=\"myParentFirstName\" referencedColumnName=\"firstName\"),\n\t@JoinColumn(name=\"myParentLastName\" referencedColumnName=\"lastName\")})\n\t@OrderBy(\"firstName\")" + }); addAnnotation (personEClass, source, new String[] { - "value", "org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" + "appinfo", "@IdClass(org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID)" }); - } - - /** - * Initializes the annotations for <b>http://annotation.elver.org/Id</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void createIdAnnotations() { - String source = "http://annotation.elver.org/Id"; addAnnotation (getPerson_FirstName(), source, new String[] { + "appinfo", "@Id" }); addAnnotation (getPerson_LastName(), source, new String[] { + "appinfo", "@Id" }); } -} //CompositeidPackageImpl +} //JoincolumnsPackageImpl diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/ParentImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/ParentImpl.java index d41472531..d86263aac 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/ParentImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/ParentImpl.java @@ -2,18 +2,20 @@ * <copyright> * </copyright> * - * $Id: ParentImpl.java,v 1.1 2006/07/11 16:57:07 mtaal Exp $ + * $Id: ParentImpl.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl; - import java.util.Collection; + import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EClass; + import org.eclipse.emf.ecore.util.EObjectResolvingEList; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Child; -import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.CompositeidPackage; +import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent; /** @@ -55,7 +57,7 @@ public class ParentImpl extends PersonImpl implements Parent { * @generated */ protected EClass eStaticClass() { - return CompositeidPackage.Literals.PARENT; + return JoincolumnsPackage.Literals.PARENT; } /** @@ -65,7 +67,7 @@ public class ParentImpl extends PersonImpl implements Parent { */ public EList getChildren() { if (children == null) { - children = new EObjectResolvingEList(Child.class, this, CompositeidPackage.PARENT__CHILDREN); + children = new EObjectResolvingEList(Child.class, this, JoincolumnsPackage.PARENT__CHILDREN); } return children; } @@ -77,7 +79,7 @@ public class ParentImpl extends PersonImpl implements Parent { */ public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case CompositeidPackage.PARENT__CHILDREN: + case JoincolumnsPackage.PARENT__CHILDREN: return getChildren(); } return super.eGet(featureID, resolve, coreType); @@ -90,7 +92,7 @@ public class ParentImpl extends PersonImpl implements Parent { */ public void eSet(int featureID, Object newValue) { switch (featureID) { - case CompositeidPackage.PARENT__CHILDREN: + case JoincolumnsPackage.PARENT__CHILDREN: getChildren().clear(); getChildren().addAll((Collection)newValue); return; @@ -105,7 +107,7 @@ public class ParentImpl extends PersonImpl implements Parent { */ public void eUnset(int featureID) { switch (featureID) { - case CompositeidPackage.PARENT__CHILDREN: + case JoincolumnsPackage.PARENT__CHILDREN: getChildren().clear(); return; } @@ -119,10 +121,10 @@ public class ParentImpl extends PersonImpl implements Parent { */ public boolean eIsSet(int featureID) { switch (featureID) { - case CompositeidPackage.PARENT__CHILDREN: + case JoincolumnsPackage.PARENT__CHILDREN: return children != null && !children.isEmpty(); } return super.eIsSet(featureID); } -} //ParentImpl +} //ParentImpl
\ No newline at end of file diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/PersonImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/PersonImpl.java index 3b9634c05..cee4246e3 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/PersonImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/impl/PersonImpl.java @@ -2,16 +2,18 @@ * <copyright> * </copyright> * - * $Id: PersonImpl.java,v 1.1 2006/07/11 16:57:07 mtaal Exp $ + * $Id: PersonImpl.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.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.emf.teneo.samples.emf.annotations.joincolumns.CompositeidPackage; +import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person; /** @@ -84,7 +86,7 @@ public class PersonImpl extends EObjectImpl implements Person { * @generated */ protected EClass eStaticClass() { - return CompositeidPackage.Literals.PERSON; + return JoincolumnsPackage.Literals.PERSON; } /** @@ -105,7 +107,7 @@ public class PersonImpl extends EObjectImpl implements Person { String oldFirstName = firstName; firstName = newFirstName; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, CompositeidPackage.PERSON__FIRST_NAME, oldFirstName, firstName)); + eNotify(new ENotificationImpl(this, Notification.SET, JoincolumnsPackage.PERSON__FIRST_NAME, oldFirstName, firstName)); } /** @@ -126,7 +128,7 @@ public class PersonImpl extends EObjectImpl implements Person { String oldLastName = lastName; lastName = newLastName; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, CompositeidPackage.PERSON__LAST_NAME, oldLastName, lastName)); + eNotify(new ENotificationImpl(this, Notification.SET, JoincolumnsPackage.PERSON__LAST_NAME, oldLastName, lastName)); } /** @@ -136,9 +138,9 @@ public class PersonImpl extends EObjectImpl implements Person { */ public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case CompositeidPackage.PERSON__FIRST_NAME: + case JoincolumnsPackage.PERSON__FIRST_NAME: return getFirstName(); - case CompositeidPackage.PERSON__LAST_NAME: + case JoincolumnsPackage.PERSON__LAST_NAME: return getLastName(); } return super.eGet(featureID, resolve, coreType); @@ -151,10 +153,10 @@ public class PersonImpl extends EObjectImpl implements Person { */ public void eSet(int featureID, Object newValue) { switch (featureID) { - case CompositeidPackage.PERSON__FIRST_NAME: + case JoincolumnsPackage.PERSON__FIRST_NAME: setFirstName((String)newValue); return; - case CompositeidPackage.PERSON__LAST_NAME: + case JoincolumnsPackage.PERSON__LAST_NAME: setLastName((String)newValue); return; } @@ -168,10 +170,10 @@ public class PersonImpl extends EObjectImpl implements Person { */ public void eUnset(int featureID) { switch (featureID) { - case CompositeidPackage.PERSON__FIRST_NAME: + case JoincolumnsPackage.PERSON__FIRST_NAME: setFirstName(FIRST_NAME_EDEFAULT); return; - case CompositeidPackage.PERSON__LAST_NAME: + case JoincolumnsPackage.PERSON__LAST_NAME: setLastName(LAST_NAME_EDEFAULT); return; } @@ -185,9 +187,9 @@ public class PersonImpl extends EObjectImpl implements Person { */ public boolean eIsSet(int featureID) { switch (featureID) { - case CompositeidPackage.PERSON__FIRST_NAME: + case JoincolumnsPackage.PERSON__FIRST_NAME: return FIRST_NAME_EDEFAULT == null ? firstName != null : !FIRST_NAME_EDEFAULT.equals(firstName); - case CompositeidPackage.PERSON__LAST_NAME: + case JoincolumnsPackage.PERSON__LAST_NAME: return LAST_NAME_EDEFAULT == null ? lastName != null : !LAST_NAME_EDEFAULT.equals(lastName); } return super.eIsSet(featureID); @@ -210,4 +212,4 @@ public class PersonImpl extends EObjectImpl implements Person { return result.toString(); } -} //PersonImpl +} //PersonImpl
\ No newline at end of file diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/model/jc.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/model/jc.ecore index 672f50fd6..d44f3cfde 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/model/jc.ecore +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/model/jc.ecore @@ -1,34 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="compositeid" - nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/joincolumns" nsPrefix="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns"> + xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="joincolumns" + nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/joincolumns" nsPrefix="joincolumns"> <eClassifiers xsi:type="ecore:EClass" name="Parent" eSuperTypes="#//Person"> <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1" eType="#//Child"> - <eAnnotations source="http://annotation.elver.org/JoinColumn"> - <details key="name" value="myParentFirstName"/> - <details key="referencedColumnName" value="firstName"/> - </eAnnotations> - <eAnnotations source="http://annotation.elver.org/JoinColumn"> - <details key="name" value="myParentLastName"/> - <details key="referencedColumnName" value="lastName"/> - </eAnnotations> - <eAnnotations source="http://annotation.elver.org/OrderBy"> - <details key="value" value="firstName"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@JoinColumns({@JoinColumn(name="myParentFirstName" referencedColumnName="firstName"),
	@JoinColumn(name="myParentLastName" referencedColumnName="lastName")})
	@OrderBy("firstName")"/> </eAnnotations> </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Child" eSuperTypes="#//Person"/> <eClassifiers xsi:type="ecore:EClass" name="Person"> - <eAnnotations source="http://annotation.elver.org/IdClass"> - <details key="value" value="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@IdClass(org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID)"/> </eAnnotations> <eStructuralFeatures xsi:type="ecore:EAttribute" name="firstName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> - <eAnnotations source="http://annotation.elver.org/Id"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Id"/> + </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> - <eAnnotations source="http://annotation.elver.org/Id"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Id"/> + </eAnnotations> </eStructuralFeatures> </eClassifiers> </ecore:EPackage> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/model/jc.genmodel b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/model/jc.genmodel index c5959e620..f52532d70 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/model/jc.genmodel +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/model/jc.genmodel @@ -4,10 +4,9 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.teneo.samples/src" modelPluginID="org.eclipse.emf.teneo.samples" modelName="Jc" importerID="org.eclipse.emf.importer.ecore"> <foreignModel>jc.ecore</foreignModel> - <genPackages prefix="JoinColumns" basePackage="org.eclipse.emf.teneo.samples.emf.annotations" - disposableProviderFactory="true" ecorePackage="jc.ecore#/"> + <genPackages prefix="Joincolumns" disposableProviderFactory="true" ecorePackage="jc.ecore#/"> <genClasses ecoreClass="jc.ecore#//Parent"> - <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference jc.ecore#//Parent/children"/> + <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference jc.ecore#//Parent/children"/> </genClasses> <genClasses ecoreClass="jc.ecore#//Child"/> <genClasses ecoreClass="jc.ecore#//Person"> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/util/CompositeidAdapterFactory.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/util/JoincolumnsAdapterFactory.java index f93bb94a3..c1b29d1ae 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/util/CompositeidAdapterFactory.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/util/JoincolumnsAdapterFactory.java @@ -2,17 +2,16 @@ * <copyright> * </copyright> * - * $Id: CompositeidAdapterFactory.java,v 1.1 2006/07/11 16:57:07 mtaal Exp $ + * $Id: JoincolumnsAdapterFactory.java,v 1.1 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.util; - import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Child; -import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.CompositeidPackage; +import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person; @@ -21,17 +20,17 @@ import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person; * The <b>Adapter Factory</b> for the model. * It provides an adapter <code>createXXX</code> method for each class of the model. * <!-- end-user-doc --> - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.CompositeidPackage + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage * @generated */ -public class CompositeidAdapterFactory extends AdapterFactoryImpl { +public class JoincolumnsAdapterFactory extends AdapterFactoryImpl { /** * The cached model package. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected static CompositeidPackage modelPackage; + protected static JoincolumnsPackage modelPackage; /** * Creates an instance of the adapter factory. @@ -39,9 +38,9 @@ public class CompositeidAdapterFactory extends AdapterFactoryImpl { * <!-- end-user-doc --> * @generated */ - public CompositeidAdapterFactory() { + public JoincolumnsAdapterFactory() { if (modelPackage == null) { - modelPackage = CompositeidPackage.eINSTANCE; + modelPackage = JoincolumnsPackage.eINSTANCE; } } @@ -69,8 +68,8 @@ public class CompositeidAdapterFactory extends AdapterFactoryImpl { * <!-- end-user-doc --> * @generated */ - protected CompositeidSwitch modelSwitch = - new CompositeidSwitch() { + protected JoincolumnsSwitch modelSwitch = + new JoincolumnsSwitch() { public Object caseParent(Parent object) { return createParentAdapter(); } @@ -99,13 +98,13 @@ public class CompositeidAdapterFactory extends AdapterFactoryImpl { /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Parent <em>Parent</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent <em>Parent</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.emf.teneo.samples.annotations.joincolumns.Parent + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent * @generated */ public Adapter createParentAdapter() { @@ -113,13 +112,13 @@ public class CompositeidAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Child <em>Child</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Child <em>Child</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.emf.teneo.samples.annotations.joincolumns.Child + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Child * @generated */ public Adapter createChildAdapter() { @@ -127,13 +126,13 @@ public class CompositeidAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.annotations.joincolumns.Person <em>Person</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person <em>Person</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.emf.teneo.samples.annotations.joincolumns.Person + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person * @generated */ public Adapter createPersonAdapter() { @@ -152,4 +151,4 @@ public class CompositeidAdapterFactory extends AdapterFactoryImpl { return null; } -} //CompositeidAdapterFactory +} //JoincolumnsAdapterFactory diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/util/CompositeidSwitch.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/util/JoincolumnsSwitch.java index 7d19a54f2..5785677f3 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/util/CompositeidSwitch.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/joincolumns/util/JoincolumnsSwitch.java @@ -2,17 +2,16 @@ * <copyright> * </copyright> * - * $Id: CompositeidSwitch.java,v 1.1 2006/07/11 16:57:07 mtaal Exp $ + * $Id: JoincolumnsSwitch.java,v 1.1 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.util; - import java.util.List; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Child; -import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.CompositeidPackage; +import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Parent; import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person; @@ -26,17 +25,17 @@ import org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.Person; * until a non-null result is returned, * which is the result of the switch. * <!-- end-user-doc --> - * @see org.eclipse.emf.teneo.samples.annotations.joincolumns.CompositeidPackage + * @see org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.JoincolumnsPackage * @generated */ -public class CompositeidSwitch { +public class JoincolumnsSwitch { /** * The cached model package * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected static CompositeidPackage modelPackage; + protected static JoincolumnsPackage modelPackage; /** * Creates an instance of the switch. @@ -44,9 +43,9 @@ public class CompositeidSwitch { * <!-- end-user-doc --> * @generated */ - public CompositeidSwitch() { + public JoincolumnsSwitch() { if (modelPackage == null) { - modelPackage = CompositeidPackage.eINSTANCE; + modelPackage = JoincolumnsPackage.eINSTANCE; } } @@ -90,21 +89,21 @@ public class CompositeidSwitch { */ protected Object doSwitch(int classifierID, EObject theEObject) { switch (classifierID) { - case CompositeidPackage.PARENT: { + case JoincolumnsPackage.PARENT: { Parent parent = (Parent)theEObject; Object result = caseParent(parent); if (result == null) result = casePerson(parent); if (result == null) result = defaultCase(theEObject); return result; } - case CompositeidPackage.CHILD: { + case JoincolumnsPackage.CHILD: { Child child = (Child)theEObject; Object result = caseChild(child); if (result == null) result = casePerson(child); if (result == null) result = defaultCase(theEObject); return result; } - case CompositeidPackage.PERSON: { + case JoincolumnsPackage.PERSON: { Person person = (Person)theEObject; Object result = casePerson(person); if (result == null) result = defaultCase(theEObject); @@ -174,4 +173,4 @@ public class CompositeidSwitch { return null; } -} //CompositeidSwitch +} //JoincolumnsSwitch diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lazy/impl/LazyFactoryImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lazy/impl/LazyFactoryImpl.java index ce7df110c..147870260 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lazy/impl/LazyFactoryImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lazy/impl/LazyFactoryImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: LazyFactoryImpl.java,v 1.3 2006/09/21 00:56:53 mtaal Exp $ + * $Id: LazyFactoryImpl.java,v 1.4 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl; @@ -12,8 +12,6 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.impl.EFactoryImpl; import org.eclipse.emf.ecore.plugin.EcorePlugin; -import org.eclipse.emf.teneo.samples.emf.annotations.lazy.*; - import org.eclipse.emf.teneo.samples.emf.annotations.lazy.Book; import org.eclipse.emf.teneo.samples.emf.annotations.lazy.BookCategory; import org.eclipse.emf.teneo.samples.emf.annotations.lazy.LazyFactory; diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/LobFactory.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/LobFactory.java index ad739cad3..d712dd60e 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/LobFactory.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/LobFactory.java @@ -2,45 +2,45 @@ * <copyright>
* </copyright>
*
- * $Id: LobFactory.java,v 1.1 2006/07/11 16:57:17 mtaal Exp $
+ * $Id: LobFactory.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.lob;
import org.eclipse.emf.ecore.EFactory;
-/**
+/** * <!-- begin-user-doc -->
* The <b>Factory</b> for the model.
* It provides a create method for each non-abstract class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage + * @generated */
public interface LobFactory extends EFactory {
- /**
- * The singleton instance of the factory.
+ /** + * The singleton instance of the factory. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
LobFactory eINSTANCE = org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.LobFactoryImpl.init();
- /**
- * Returns a new object of class '<em>Person</em>'.
+ /** + * Returns a new object of class '<em>Person</em>'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return a new object of class '<em>Person</em>'.
- * @generated
+ * @return a new object of class '<em>Person</em>'. + * @generated */
- Person createPerson();
-
- /**
- * Returns the package supported by this factory.
+ Person createPerson(); + + /** + * Returns the package supported by this factory. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the package supported by this factory.
- * @generated
+ * @return the package supported by this factory. + * @generated */
- LobPackage getLobPackage();
-
+ LobPackage getLobPackage(); + } //LobFactory
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/LobPackage.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/LobPackage.java index 202e4518c..b8708ec58 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/LobPackage.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/LobPackage.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: LobPackage.java,v 1.1 2006/07/11 16:57:17 mtaal Exp $
+ * $Id: LobPackage.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.lob;
@@ -10,7 +10,7 @@ import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
-/**
+/** * <!-- begin-user-doc -->
* The <b>Package</b> for the model.
* It contains accessors for the meta objects to represent
@@ -21,163 +21,163 @@ import org.eclipse.emf.ecore.EPackage; * <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobFactory
- * @model kind="package"
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobFactory + * @model kind="package" + * @generated */
public interface LobPackage extends EPackage {
- /**
- * The package name.
+ /** + * The package name. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
String eNAME = "lob";
- /**
- * The package namespace URI.
+ /** + * The package namespace URI. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
String eNS_URI = "http://www.eclipse.org/emf/teneo/samples/emf/annotations/lob";
- /**
- * The package namespace name.
+ /** + * The package namespace name. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
String eNS_PREFIX = "lob";
- /**
- * The singleton instance of the package.
+ /** + * The singleton instance of the package. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
LobPackage eINSTANCE = org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.LobPackageImpl.init();
- /**
- * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl <em>Person</em>}' class.
+ /** + * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl <em>Person</em>}' class. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.LobPackageImpl#getPerson()
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.LobPackageImpl#getPerson() + * @generated */
int PERSON = 0;
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
+ /** + * The feature id for the '<em><b>Id</b></em>' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- * @ordered
+ * @generated + * @ordered */
int PERSON__ID = 0;
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
+ /** + * The feature id for the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- * @ordered
+ * @generated + * @ordered */
int PERSON__NAME = 1;
- /**
- * The feature id for the '<em><b>Address</b></em>' attribute.
+ /** + * The feature id for the '<em><b>Address</b></em>' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- * @ordered
+ * @generated + * @ordered */
int PERSON__ADDRESS = 2;
- /**
- * The feature id for the '<em><b>Photo</b></em>' attribute.
+ /** + * The feature id for the '<em><b>Photo</b></em>' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- * @ordered
+ * @generated + * @ordered */
int PERSON__PHOTO = 3;
- /**
- * The number of structural features of the '<em>Person</em>' class.
+ /** + * The number of structural features of the '<em>Person</em>' class. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- * @ordered
+ * @generated + * @ordered */
int PERSON_FEATURE_COUNT = 4;
- /**
- * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person <em>Person</em>}'.
+ /** + * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person <em>Person</em>}'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for class '<em>Person</em>'.
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.Person
- * @generated
+ * @return the meta object for class '<em>Person</em>'. + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.Person + * @generated */
- EClass getPerson();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getId <em>Id</em>}'.
+ EClass getPerson(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getId <em>Id</em>}'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Id</em>'.
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getId()
- * @see #getPerson()
- * @generated
+ * @return the meta object for the attribute '<em>Id</em>'. + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getId() + * @see #getPerson() + * @generated */
- EAttribute getPerson_Id();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getName <em>Name</em>}'.
+ EAttribute getPerson_Id(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getName <em>Name</em>}'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getName()
- * @see #getPerson()
- * @generated
+ * @return the meta object for the attribute '<em>Name</em>'. + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getName() + * @see #getPerson() + * @generated */
- EAttribute getPerson_Name();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getAddress <em>Address</em>}'.
+ EAttribute getPerson_Name(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getAddress <em>Address</em>}'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Address</em>'.
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getAddress()
- * @see #getPerson()
- * @generated
+ * @return the meta object for the attribute '<em>Address</em>'. + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getAddress() + * @see #getPerson() + * @generated */
- EAttribute getPerson_Address();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getPhoto <em>Photo</em>}'.
+ EAttribute getPerson_Address(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getPhoto <em>Photo</em>}'. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Photo</em>'.
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getPhoto()
- * @see #getPerson()
- * @generated
+ * @return the meta object for the attribute '<em>Photo</em>'. + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getPhoto() + * @see #getPerson() + * @generated */
- EAttribute getPerson_Photo();
-
- /**
- * Returns the factory that creates the instances of the model.
+ EAttribute getPerson_Photo(); + + /** + * Returns the factory that creates the instances of the model. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the factory that creates the instances of the model.
- * @generated
+ * @return the factory that creates the instances of the model. + * @generated */
- LobFactory getLobFactory();
-
- /**
+ LobFactory getLobFactory(); + + /** * <!-- begin-user-doc -->
* Defines literals for the meta objects that represent
* <ul>
@@ -187,48 +187,48 @@ public interface LobPackage extends EPackage { * <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- interface Literals {
- /**
- * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl <em>Person</em>}' class.
+ interface Literals {
+ /** + * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl <em>Person</em>}' class. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.LobPackageImpl#getPerson()
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.LobPackageImpl#getPerson() + * @generated */
EClass PERSON = eINSTANCE.getPerson();
- /**
- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
+ /** + * The meta object literal for the '<em><b>Id</b></em>' attribute feature. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
EAttribute PERSON__ID = eINSTANCE.getPerson_Id();
- /**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+ /** + * The meta object literal for the '<em><b>Name</b></em>' attribute feature. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
EAttribute PERSON__NAME = eINSTANCE.getPerson_Name();
- /**
- * The meta object literal for the '<em><b>Address</b></em>' attribute feature.
+ /** + * The meta object literal for the '<em><b>Address</b></em>' attribute feature. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
EAttribute PERSON__ADDRESS = eINSTANCE.getPerson_Address();
- /**
- * The meta object literal for the '<em><b>Photo</b></em>' attribute feature.
+ /** + * The meta object literal for the '<em><b>Photo</b></em>' attribute feature. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
EAttribute PERSON__PHOTO = eINSTANCE.getPerson_Photo();
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/Person.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/Person.java index 70fad5637..c9c56716b 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/Person.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/Person.java @@ -2,169 +2,168 @@ * <copyright>
* </copyright>
*
- * $Id: Person.java,v 1.1 2006/07/11 16:57:17 mtaal Exp $
+ * $Id: Person.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.lob;
import org.eclipse.emf.ecore.EObject;
-/**
+/** * <!-- begin-user-doc -->
* A representation of the model object '<em><b>Person</b></em>'.
* <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getId <em>Id</em>}</li>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getAddress <em>Address</em>}</li>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getPhoto <em>Photo</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage#getPerson()
- * @model extendedMetaData="name='Person' kind='elementOnly'"
- * @generated
+ * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getId <em>Id</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getAddress <em>Address</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getPhoto <em>Photo</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage#getPerson() + * @model extendedMetaData="name='Person' kind='elementOnly'" + * @generated */
public interface Person extends EObject {
- /**
- * Returns the value of the '<em><b>Id</b></em>' attribute.
+ /** + * Returns the value of the '<em><b>Id</b></em>' attribute. * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Id</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Id</em>' attribute.
- * @see #isSetId()
- * @see #unsetId()
- * @see #setId(long)
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage#getPerson_Id()
- * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Long" required="true"
- * annotation="http://annotation.elver.org/Id appinfo='true'"
- * extendedMetaData="kind='element' name='id'"
- * @generated
+ * @return the value of the '<em>Id</em>' attribute. + * @see #isSetId() + * @see #unsetId() + * @see #setId(long) + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage#getPerson_Id() + * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Long" required="true" + * annotation="teneo.jpa appinfo='@Id'" + * extendedMetaData="kind='element' name='id'" + * @generated */
- long getId();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getId <em>Id</em>}' attribute.
+ long getId(); + + /** + * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getId <em>Id</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Id</em>' attribute.
- * @see #isSetId()
- * @see #unsetId()
- * @see #getId()
- * @generated
+ * @param value the new value of the '<em>Id</em>' attribute. + * @see #isSetId() + * @see #unsetId() + * @see #getId() + * @generated */
- void setId(long value);
-
- /**
- * Unsets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getId <em>Id</em>}' attribute.
+ void setId(long value); + + /** + * Unsets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getId <em>Id</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #isSetId()
- * @see #getId()
- * @see #setId(long)
- * @generated
+ * @see #isSetId() + * @see #getId() + * @see #setId(long) + * @generated */
- void unsetId();
-
- /**
- * Returns whether the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getId <em>Id</em>}' attribute is set.
+ void unsetId(); + + /** + * Returns whether the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getId <em>Id</em>}' attribute is set. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return whether the value of the '<em>Id</em>' attribute is set.
- * @see #unsetId()
- * @see #getId()
- * @see #setId(long)
- * @generated
+ * @return whether the value of the '<em>Id</em>' attribute is set. + * @see #unsetId() + * @see #getId() + * @see #setId(long) + * @generated */
- boolean isSetId();
-
- /**
- * Returns the value of the '<em><b>Name</b></em>' attribute.
+ boolean isSetId(); + + /** + * Returns the value of the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Name</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Name</em>' attribute.
- * @see #setName(String)
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage#getPerson_Name()
- * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
- * extendedMetaData="kind='element' name='name'"
- * @generated
+ * @return the value of the '<em>Name</em>' attribute. + * @see #setName(String) + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage#getPerson_Name() + * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true" + * extendedMetaData="kind='element' name='name'" + * @generated */
- String getName();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getName <em>Name</em>}' attribute.
+ String getName(); + + /** + * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getName <em>Name</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Name</em>' attribute.
- * @see #getName()
- * @generated
+ * @param value the new value of the '<em>Name</em>' attribute. + * @see #getName() + * @generated */
- void setName(String value);
-
- /**
- * Returns the value of the '<em><b>Address</b></em>' attribute.
+ void setName(String value); + + /** + * Returns the value of the '<em><b>Address</b></em>' attribute. * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Address</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Address</em>' attribute.
- * @see #setAddress(String)
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage#getPerson_Address()
- * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
- * annotation="http://annotation.elver.org/Lob appinfo='true'"
- * extendedMetaData="kind='element' name='address'"
- * @generated
+ * @return the value of the '<em>Address</em>' attribute. + * @see #setAddress(String) + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage#getPerson_Address() + * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" + * annotation="teneo.jpa appinfo='@Lob'" + * extendedMetaData="kind='element' name='address'" + * @generated */
- String getAddress();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getAddress <em>Address</em>}' attribute.
+ String getAddress(); + + /** + * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getAddress <em>Address</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Address</em>' attribute.
- * @see #getAddress()
- * @generated
+ * @param value the new value of the '<em>Address</em>' attribute. + * @see #getAddress() + * @generated */
- void setAddress(String value);
-
- /**
- * Returns the value of the '<em><b>Photo</b></em>' attribute.
+ void setAddress(String value); + + /** + * Returns the value of the '<em><b>Photo</b></em>' attribute. * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Photo</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Photo</em>' attribute.
- * @see #setPhoto(byte[])
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage#getPerson_Photo()
- * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Base64Binary"
- * annotation="http://annotation.elver.org/Lob appinfo='true'"
- * annotation="http://annotation.elver.org/Column length='1000000'"
- * extendedMetaData="kind='element' name='photo'"
- * @generated
+ * @return the value of the '<em>Photo</em>' attribute. + * @see #setPhoto(byte[]) + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage#getPerson_Photo() + * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Base64Binary" + * annotation="teneo.jpa appinfo='\n\t\t\t\t\t\t@Lob\n\t\t\t\t\t\t@Column(length=1000000)\n\t\t\t\t'" + * extendedMetaData="kind='element' name='photo'" + * @generated */
- byte[] getPhoto();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getPhoto <em>Photo</em>}' attribute.
+ byte[] getPhoto(); + + /** + * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person#getPhoto <em>Photo</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Photo</em>' attribute.
- * @see #getPhoto()
- * @generated
+ * @param value the new value of the '<em>Photo</em>' attribute. + * @see #getPhoto() + * @generated */
- void setPhoto(byte[] value);
-
+ void setPhoto(byte[] value); + } // Person
\ No newline at end of file diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/impl/LobFactoryImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/impl/LobFactoryImpl.java index b9815e8d1..50d6e99c4 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/impl/LobFactoryImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/impl/LobFactoryImpl.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: LobFactoryImpl.java,v 1.1 2006/07/11 16:56:58 mtaal Exp $
+ * $Id: LobFactoryImpl.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.lob.impl;
@@ -16,82 +16,82 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin; import org.eclipse.emf.teneo.samples.emf.annotations.lob.*;
-/**
+/** * <!-- begin-user-doc -->
* An implementation of the model <b>Factory</b>.
* <!-- end-user-doc -->
- * @generated
+ * @generated */
public class LobFactoryImpl extends EFactoryImpl implements LobFactory {
- /**
- * Creates the default factory implementation.
+ /** + * Creates the default factory implementation. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public static LobFactory init() {
- try {
- LobFactory theLobFactory = (LobFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/teneo/samples/emf/annotations/lob");
- if (theLobFactory != null) {
- return theLobFactory;
- }
- }
- catch (Exception exception) {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new LobFactoryImpl();
- }
-
- /**
- * Creates an instance of the factory.
+ public static LobFactory init() { + try { + LobFactory theLobFactory = (LobFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/teneo/samples/emf/annotations/lob"); + if (theLobFactory != null) { + return theLobFactory; + } + } + catch (Exception exception) { + EcorePlugin.INSTANCE.log(exception); + } + return new LobFactoryImpl(); + } + + /** + * Creates an instance of the factory. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public LobFactoryImpl() {
- super();
- }
-
- /**
+ public LobFactoryImpl() { + super(); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
- case LobPackage.PERSON: return createPerson();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
- }
- }
-
- /**
+ public EObject create(EClass eClass) { + switch (eClass.getClassifierID()) { + case LobPackage.PERSON: return createPerson(); + default: + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); + } + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public Person createPerson() {
- PersonImpl person = new PersonImpl();
- return person;
- }
-
- /**
+ public Person createPerson() { + PersonImpl person = new PersonImpl(); + return person; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public LobPackage getLobPackage() {
- return (LobPackage)getEPackage();
- }
-
- /**
+ public LobPackage getLobPackage() { + return (LobPackage)getEPackage(); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @deprecated
- * @generated
+ * @deprecated + * @generated */
- public static LobPackage getPackage() {
- return LobPackage.eINSTANCE;
- }
-
+ public static LobPackage getPackage() { + return LobPackage.eINSTANCE; + } + } //LobFactoryImpl
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/impl/LobPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/impl/LobPackageImpl.java index 440e47367..97b6abcd7 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/impl/LobPackageImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/impl/LobPackageImpl.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: LobPackageImpl.java,v 1.1 2006/07/11 16:56:58 mtaal Exp $
+ * $Id: LobPackageImpl.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.lob.impl;
@@ -18,317 +18,287 @@ import org.eclipse.emf.teneo.samples.emf.annotations.lob.LobFactory; import org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage;
import org.eclipse.emf.teneo.samples.emf.annotations.lob.Person;
-/**
+/** * <!-- begin-user-doc -->
* An implementation of the model <b>Package</b>.
* <!-- end-user-doc -->
- * @generated
+ * @generated */
public class LobPackageImpl extends EPackageImpl implements LobPackage {
- /**
+ /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
private EClass personEClass = 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.
- * <p>Note: the correct way to create the package is via the static
- * factory method {@link #init init()}, which also performs
- * initialization of the package, or returns the registered package,
- * if one already exists.
+ /** + * 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. + * <p>Note: the correct way to create the package is via the static + * factory method {@link #init init()}, which also performs + * initialization of the package, or returns the registered package, + * if one already exists. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage#eNS_URI
- * @see #init()
- * @generated
+ * @see org.eclipse.emf.ecore.EPackage.Registry + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage#eNS_URI + * @see #init() + * @generated */
- private LobPackageImpl() {
- super(eNS_URI, LobFactory.eINSTANCE);
- }
-
- /**
+ private LobPackageImpl() { + super(eNS_URI, LobFactory.eINSTANCE); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
private static boolean isInited = false;
- /**
- * Creates, registers, and initializes the <b>Package</b> for this
- * model, and for any others upon which it depends. Simple
- * dependencies are satisfied by calling this method on all
- * dependent packages before doing anything else. This method drives
- * initialization for interdependent packages directly, in parallel
- * with this package, itself.
- * <p>Of this package and its interdependencies, all packages which
- * have not yet been registered by their URI values are first created
- * and registered. The packages are then initialized in two steps:
- * meta-model objects for all of the packages are created before any
- * are initialized, since one package's meta-model objects may refer to
- * those of another.
- * <p>Invocation of this method will not affect any packages that have
- * already been initialized.
+ /** + * Creates, registers, and initializes the <b>Package</b> for this + * model, and for any others upon which it depends. Simple + * dependencies are satisfied by calling this method on all + * dependent packages before doing anything else. This method drives + * initialization for interdependent packages directly, in parallel + * with this package, itself. + * <p>Of this package and its interdependencies, all packages which + * have not yet been registered by their URI values are first created + * and registered. The packages are then initialized in two steps: + * meta-model objects for all of the packages are created before any + * are initialized, since one package's meta-model objects may refer to + * those of another. + * <p>Invocation of this method will not affect any packages that have + * already been initialized. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
+ * @see #eNS_URI + * @see #createPackageContents() + * @see #initializePackageContents() + * @generated */
- public static LobPackage init() {
- if (isInited) return (LobPackage)EPackage.Registry.INSTANCE.getEPackage(LobPackage.eNS_URI);
-
- // Obtain or create and register package
- LobPackageImpl theLobPackage = (LobPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof LobPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new LobPackageImpl());
-
- isInited = true;
-
- // Initialize simple dependencies
- XMLTypePackage.eINSTANCE.eClass();
-
- // Create package meta-data objects
- theLobPackage.createPackageContents();
-
- // Initialize created meta-data
- theLobPackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theLobPackage.freeze();
-
- return theLobPackage;
- }
-
- /**
+ public static LobPackage init() { + if (isInited) return (LobPackage)EPackage.Registry.INSTANCE.getEPackage(LobPackage.eNS_URI); + + // Obtain or create and register package + LobPackageImpl theLobPackage = (LobPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof LobPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new LobPackageImpl()); + + isInited = true; + + // Initialize simple dependencies + XMLTypePackage.eINSTANCE.eClass(); + + // Create package meta-data objects + theLobPackage.createPackageContents(); + + // Initialize created meta-data + theLobPackage.initializePackageContents(); + + // Mark meta-data to indicate it can't be changed + theLobPackage.freeze(); + + return theLobPackage; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EClass getPerson() {
- return personEClass;
- }
-
- /**
+ public EClass getPerson() { + return personEClass; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EAttribute getPerson_Id() {
- return (EAttribute)personEClass.getEStructuralFeatures().get(0);
- }
-
- /**
+ public EAttribute getPerson_Id() { + return (EAttribute)personEClass.getEStructuralFeatures().get(0); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EAttribute getPerson_Name() {
- return (EAttribute)personEClass.getEStructuralFeatures().get(1);
- }
-
- /**
+ public EAttribute getPerson_Name() { + return (EAttribute)personEClass.getEStructuralFeatures().get(1); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EAttribute getPerson_Address() {
- return (EAttribute)personEClass.getEStructuralFeatures().get(2);
- }
-
- /**
+ public EAttribute getPerson_Address() { + return (EAttribute)personEClass.getEStructuralFeatures().get(2); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public EAttribute getPerson_Photo() {
- return (EAttribute)personEClass.getEStructuralFeatures().get(3);
- }
-
- /**
+ public EAttribute getPerson_Photo() { + return (EAttribute)personEClass.getEStructuralFeatures().get(3); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public LobFactory getLobFactory() {
- return (LobFactory)getEFactoryInstance();
- }
-
- /**
+ public LobFactory getLobFactory() { + return (LobFactory)getEFactoryInstance(); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
private boolean isCreated = false;
- /**
- * Creates the meta-model objects for the package. This method is
- * guarded to have no affect on any invocation but its first.
+ /** + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void createPackageContents() {
- if (isCreated) return;
- isCreated = true;
-
- // Create classes and their features
- personEClass = createEClass(PERSON);
- createEAttribute(personEClass, PERSON__ID);
- createEAttribute(personEClass, PERSON__NAME);
- createEAttribute(personEClass, PERSON__ADDRESS);
- createEAttribute(personEClass, PERSON__PHOTO);
- }
-
- /**
+ public void createPackageContents() { + if (isCreated) return; + isCreated = true; + + // Create classes and their features + personEClass = createEClass(PERSON); + createEAttribute(personEClass, PERSON__ID); + createEAttribute(personEClass, PERSON__NAME); + createEAttribute(personEClass, PERSON__ADDRESS); + createEAttribute(personEClass, PERSON__PHOTO); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
private boolean isInitialized = false;
- /**
- * Complete the initialization of the package and its meta-model. This
- * method is guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void initializePackageContents() {
- if (isInitialized) return;
- isInitialized = true;
-
- // Initialize package
- setName(eNAME);
- setNsPrefix(eNS_PREFIX);
- setNsURI(eNS_URI);
-
- // Obtain other dependent packages
- XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-
- // Add supertypes to classes
-
- // Initialize classes and features; add operations and parameters
- initEClass(personEClass, Person.class, "Person", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPerson_Id(), theXMLTypePackage.getLong(), "id", null, 1, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPerson_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPerson_Address(), theXMLTypePackage.getString(), "address", null, 0, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPerson_Photo(), theXMLTypePackage.getBase64Binary(), "photo", null, 0, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- // Create resource
- createResource(eNS_URI);
-
- // Create annotations
- // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
- createExtendedMetaDataAnnotations();
- // http://annotation.elver.org/Id
- createIdAnnotations();
- // http://annotation.elver.org/Lob
- createLobAnnotations();
- // http://annotation.elver.org/Column
- createColumnAnnotations();
- }
-
- /**
- * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
+ /** + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- protected void createExtendedMetaDataAnnotations() {
- String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
- addAnnotation
- (personEClass,
- source,
- new String[] {
- "name", "Person",
- "kind", "elementOnly"
- });
- addAnnotation
- (getPerson_Id(),
- source,
- new String[] {
- "kind", "element",
- "name", "id"
- });
- addAnnotation
- (getPerson_Name(),
- source,
- new String[] {
- "kind", "element",
- "name", "name"
- });
- addAnnotation
- (getPerson_Address(),
- source,
- new String[] {
- "kind", "element",
- "name", "address"
- });
- addAnnotation
- (getPerson_Photo(),
- source,
- new String[] {
- "kind", "element",
- "name", "photo"
- });
- }
-
- /**
- * Initializes the annotations for <b>http://annotation.elver.org/Id</b>.
+ public void initializePackageContents() { + if (isInitialized) return; + isInitialized = true; + + // Initialize package + setName(eNAME); + setNsPrefix(eNS_PREFIX); + setNsURI(eNS_URI); + + // Obtain other dependent packages + XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI); + + // Add supertypes to classes + + // Initialize classes and features; add operations and parameters + initEClass(personEClass, Person.class, "Person", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getPerson_Id(), theXMLTypePackage.getLong(), "id", null, 1, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getPerson_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getPerson_Address(), theXMLTypePackage.getString(), "address", null, 0, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getPerson_Photo(), theXMLTypePackage.getBase64Binary(), "photo", null, 0, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + // Create resource + createResource(eNS_URI); + + // Create annotations + // http:///org/eclipse/emf/ecore/util/ExtendedMetaData + createExtendedMetaDataAnnotations(); + // teneo.jpa + createTeneoAnnotations(); + } + + /** + * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- protected void createIdAnnotations() {
- String source = "http://annotation.elver.org/Id";
- addAnnotation
- (getPerson_Id(),
- source,
- new String[] {
- "appinfo", "true"
- });
- }
-
- /**
- * Initializes the annotations for <b>http://annotation.elver.org/Lob</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void createLobAnnotations() {
- String source = "http://annotation.elver.org/Lob";
- addAnnotation
- (getPerson_Address(),
- source,
- new String[] {
- "appinfo", "true"
- });
- addAnnotation
- (getPerson_Photo(),
- source,
- new String[] {
- "appinfo", "true"
- });
- }
-
- /**
- * Initializes the annotations for <b>http://annotation.elver.org/Column</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void createColumnAnnotations() {
- String source = "http://annotation.elver.org/Column";
- addAnnotation
- (getPerson_Photo(),
- source,
- new String[] {
- "length", "1000000"
- });
- }
-
+ protected void createExtendedMetaDataAnnotations() { + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; + addAnnotation + (personEClass, + source, + new String[] { + "name", "Person", + "kind", "elementOnly" + }); + addAnnotation + (getPerson_Id(), + source, + new String[] { + "kind", "element", + "name", "id" + }); + addAnnotation + (getPerson_Name(), + source, + new String[] { + "kind", "element", + "name", "name" + }); + addAnnotation + (getPerson_Address(), + source, + new String[] { + "kind", "element", + "name", "address" + }); + addAnnotation + (getPerson_Photo(), + source, + new String[] { + "kind", "element", + "name", "photo" + }); + } + + /** + * Initializes the annotations for <b>teneo.jpa</b>. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void createTeneoAnnotations() { + String source = "teneo.jpa"; + addAnnotation + (getPerson_Id(), + source, + new String[] { + "appinfo", "@Id" + }); + addAnnotation + (getPerson_Address(), + source, + new String[] { + "appinfo", "@Lob" + }); + addAnnotation + (getPerson_Photo(), + source, + new String[] { + "appinfo", "\n\t\t\t\t\t\t@Lob\n\t\t\t\t\t\t@Column(length=1000000)\n\t\t\t\t" + }); + } + } //LobPackageImpl
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/impl/PersonImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/impl/PersonImpl.java index 6a2a3d7ed..7f81db63a 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/impl/PersonImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/impl/PersonImpl.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: PersonImpl.java,v 1.1 2006/07/11 16:56:58 mtaal Exp $
+ * $Id: PersonImpl.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.lob.impl;
@@ -16,342 +16,342 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; import org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage;
import org.eclipse.emf.teneo.samples.emf.annotations.lob.Person;
-/**
+/** * <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Person</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl#getId <em>Id</em>}</li>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl#getAddress <em>Address</em>}</li>
- * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl#getPhoto <em>Photo</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
+ * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl#getId <em>Id</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl#getAddress <em>Address</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl#getPhoto <em>Photo</em>}</li> + * </ul> + * </p> + * + * @generated */
public class PersonImpl extends EObjectImpl implements Person {
- /**
- * The default value of the '{@link #getId() <em>Id</em>}' attribute.
+ /** + * The default value of the '{@link #getId() <em>Id</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
+ * @see #getId() + * @generated + * @ordered */
protected static final long ID_EDEFAULT = 0L;
- /**
- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
+ /** + * The cached value of the '{@link #getId() <em>Id</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
+ * @see #getId() + * @generated + * @ordered */
protected long id = ID_EDEFAULT;
- /**
- * This is true if the Id attribute has been set.
+ /** + * This is true if the Id attribute has been set. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- * @ordered
+ * @generated + * @ordered */
protected boolean idESet = false;
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+ /** + * The default value of the '{@link #getName() <em>Name</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
+ * @see #getName() + * @generated + * @ordered */
protected static final String NAME_EDEFAULT = null;
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+ /** + * The cached value of the '{@link #getName() <em>Name</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
+ * @see #getName() + * @generated + * @ordered */
protected String name = NAME_EDEFAULT;
- /**
- * The default value of the '{@link #getAddress() <em>Address</em>}' attribute.
+ /** + * The default value of the '{@link #getAddress() <em>Address</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getAddress()
- * @generated
- * @ordered
+ * @see #getAddress() + * @generated + * @ordered */
protected static final String ADDRESS_EDEFAULT = null;
- /**
- * The cached value of the '{@link #getAddress() <em>Address</em>}' attribute.
+ /** + * The cached value of the '{@link #getAddress() <em>Address</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getAddress()
- * @generated
- * @ordered
+ * @see #getAddress() + * @generated + * @ordered */
protected String address = ADDRESS_EDEFAULT;
- /**
- * The default value of the '{@link #getPhoto() <em>Photo</em>}' attribute.
+ /** + * The default value of the '{@link #getPhoto() <em>Photo</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getPhoto()
- * @generated
- * @ordered
+ * @see #getPhoto() + * @generated + * @ordered */
protected static final byte[] PHOTO_EDEFAULT = null;
- /**
- * The cached value of the '{@link #getPhoto() <em>Photo</em>}' attribute.
+ /** + * The cached value of the '{@link #getPhoto() <em>Photo</em>}' attribute. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getPhoto()
- * @generated
- * @ordered
+ * @see #getPhoto() + * @generated + * @ordered */
protected byte[] photo = PHOTO_EDEFAULT;
- /**
+ /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- protected PersonImpl() {
- super();
- }
-
- /**
+ protected PersonImpl() { + super(); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- protected EClass eStaticClass() {
- return LobPackage.Literals.PERSON;
- }
-
- /**
+ protected EClass eStaticClass() { + return LobPackage.Literals.PERSON; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public long getId() {
- return id;
- }
-
- /**
+ public long getId() { + return id; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void setId(long newId) {
- long oldId = id;
- id = newId;
- boolean oldIdESet = idESet;
- idESet = true;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, LobPackage.PERSON__ID, oldId, id, !oldIdESet));
- }
-
- /**
+ public void setId(long newId) { + long oldId = id; + id = newId; + boolean oldIdESet = idESet; + idESet = true; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, LobPackage.PERSON__ID, oldId, id, !oldIdESet)); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void unsetId() {
- long oldId = id;
- boolean oldIdESet = idESet;
- id = ID_EDEFAULT;
- idESet = false;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, LobPackage.PERSON__ID, oldId, ID_EDEFAULT, oldIdESet));
- }
-
- /**
+ public void unsetId() { + long oldId = id; + boolean oldIdESet = idESet; + id = ID_EDEFAULT; + idESet = false; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.UNSET, LobPackage.PERSON__ID, oldId, ID_EDEFAULT, oldIdESet)); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public boolean isSetId() {
- return idESet;
- }
-
- /**
+ public boolean isSetId() { + return idESet; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public String getName() {
- return name;
- }
-
- /**
+ public String getName() { + return name; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, LobPackage.PERSON__NAME, oldName, name));
- }
-
- /**
+ public void setName(String newName) { + String oldName = name; + name = newName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, LobPackage.PERSON__NAME, oldName, name)); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public String getAddress() {
- return address;
- }
-
- /**
+ public String getAddress() { + return address; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void setAddress(String newAddress) {
- String oldAddress = address;
- address = newAddress;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, LobPackage.PERSON__ADDRESS, oldAddress, address));
- }
-
- /**
+ public void setAddress(String newAddress) { + String oldAddress = address; + address = newAddress; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, LobPackage.PERSON__ADDRESS, oldAddress, address)); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public byte[] getPhoto() {
- return photo;
- }
-
- /**
+ public byte[] getPhoto() { + return photo; + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void setPhoto(byte[] newPhoto) {
- byte[] oldPhoto = photo;
- photo = newPhoto;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, LobPackage.PERSON__PHOTO, oldPhoto, photo));
- }
-
- /**
+ public void setPhoto(byte[] newPhoto) { + byte[] oldPhoto = photo; + photo = newPhoto; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, LobPackage.PERSON__PHOTO, oldPhoto, photo)); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case LobPackage.PERSON__ID:
- return new Long(getId());
- case LobPackage.PERSON__NAME:
- return getName();
- case LobPackage.PERSON__ADDRESS:
- return getAddress();
- case LobPackage.PERSON__PHOTO:
- return getPhoto();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
+ public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case LobPackage.PERSON__ID: + return new Long(getId()); + case LobPackage.PERSON__NAME: + return getName(); + case LobPackage.PERSON__ADDRESS: + return getAddress(); + case LobPackage.PERSON__PHOTO: + return getPhoto(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case LobPackage.PERSON__ID:
- setId(((Long)newValue).longValue());
- return;
- case LobPackage.PERSON__NAME:
- setName((String)newValue);
- return;
- case LobPackage.PERSON__ADDRESS:
- setAddress((String)newValue);
- return;
- case LobPackage.PERSON__PHOTO:
- setPhoto((byte[])newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
+ public void eSet(int featureID, Object newValue) { + switch (featureID) { + case LobPackage.PERSON__ID: + setId(((Long)newValue).longValue()); + return; + case LobPackage.PERSON__NAME: + setName((String)newValue); + return; + case LobPackage.PERSON__ADDRESS: + setAddress((String)newValue); + return; + case LobPackage.PERSON__PHOTO: + setPhoto((byte[])newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public void eUnset(int featureID) {
- switch (featureID) {
- case LobPackage.PERSON__ID:
- unsetId();
- return;
- case LobPackage.PERSON__NAME:
- setName(NAME_EDEFAULT);
- return;
- case LobPackage.PERSON__ADDRESS:
- setAddress(ADDRESS_EDEFAULT);
- return;
- case LobPackage.PERSON__PHOTO:
- setPhoto(PHOTO_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
+ public void eUnset(int featureID) { + switch (featureID) { + case LobPackage.PERSON__ID: + unsetId(); + return; + case LobPackage.PERSON__NAME: + setName(NAME_EDEFAULT); + return; + case LobPackage.PERSON__ADDRESS: + setAddress(ADDRESS_EDEFAULT); + return; + case LobPackage.PERSON__PHOTO: + setPhoto(PHOTO_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case LobPackage.PERSON__ID:
- return isSetId();
- case LobPackage.PERSON__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case LobPackage.PERSON__ADDRESS:
- return ADDRESS_EDEFAULT == null ? address != null : !ADDRESS_EDEFAULT.equals(address);
- case LobPackage.PERSON__PHOTO:
- return PHOTO_EDEFAULT == null ? photo != null : !PHOTO_EDEFAULT.equals(photo);
- }
- return super.eIsSet(featureID);
- }
-
- /**
+ public boolean eIsSet(int featureID) { + switch (featureID) { + case LobPackage.PERSON__ID: + return isSetId(); + case LobPackage.PERSON__NAME: + return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case LobPackage.PERSON__ADDRESS: + return ADDRESS_EDEFAULT == null ? address != null : !ADDRESS_EDEFAULT.equals(address); + case LobPackage.PERSON__PHOTO: + return PHOTO_EDEFAULT == null ? photo != null : !PHOTO_EDEFAULT.equals(photo); + } + return super.eIsSet(featureID); + } + + /** * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (id: ");
- if (idESet) result.append(id); else result.append("<unset>");
- result.append(", name: ");
- result.append(name);
- result.append(", address: ");
- result.append(address);
- result.append(", photo: ");
- result.append(photo);
- result.append(')');
- return result.toString();
- }
-
+ public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (id: "); + if (idESet) result.append(id); else result.append("<unset>"); + result.append(", name: "); + result.append(name); + result.append(", address: "); + result.append(address); + result.append(", photo: "); + result.append(photo); + result.append(')'); + return result.toString(); + } + } //PersonImpl
\ No newline at end of file diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/model/lob.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/model/lob.ecore index 7d3b7856d..f180b9ab8 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/model/lob.ecore +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/model/lob.ecore @@ -1,51 +1,48 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="lob"
- nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/lob" nsPrefix="lob">
- <eClassifiers xsi:type="ecore:EClass" name="Person">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="Person"/>
- <details key="kind" value="elementOnly"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" unique="false" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Long" unsettable="true">
- <eAnnotations source="http://annotation.elver.org/Id">
- <details key="appinfo" value="true"/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="id"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="name"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="address" unique="false"
- eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
- <eAnnotations source="http://annotation.elver.org/Lob">
- <details key="appinfo" value="true"/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="address"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="photo" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Base64Binary">
- <eAnnotations source="http://annotation.elver.org/Lob">
- <details key="appinfo" value="true"/>
- </eAnnotations>
- <eAnnotations source="http://annotation.elver.org/Column">
- <details key="length" value="1000000"/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="photo"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?> +<ecore:EPackage xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="lob" + nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/lob" nsPrefix="lob"> + <eClassifiers xsi:type="ecore:EClass" name="Person"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value="Person"/> + <details key="kind" value="elementOnly"/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" unique="false" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Long" unsettable="true"> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Id"/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="id"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="name"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="address" unique="false" + eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Lob"/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="address"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="photo" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Base64Binary"> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="
						@Lob
						@Column(length=1000000)
				"/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="photo"/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> +</ecore:EPackage> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/model/lob.genmodel b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/model/lob.genmodel index 13ef9ebfe..518017d6b 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/model/lob.genmodel +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/model/lob.genmodel @@ -1,16 +1,16 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.teneo.samples/src"
- modelPluginID="org.eclipse.emf.teneo.samples" modelName="Lob" importerID="org.eclipse.xsd.ecore.importer">
- <foreignModel>lob.xsd</foreignModel>
- <genPackages prefix="Lob" basePackage="org.eclipse.emf.teneo.samples.emf.annotations" resource="XML"
- disposableProviderFactory="true" ecorePackage="lob.ecore#/">
- <genClasses ecoreClass="lob.ecore#//Person">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute lob.ecore#//Person/id"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute lob.ecore#//Person/name"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute lob.ecore#//Person/address"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute lob.ecore#//Person/photo"/>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-8"?> +<genmodel:GenModel xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" + xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.teneo.samples/src" + modelPluginID="org.eclipse.emf.teneo.samples" modelName="Lob" importerID="org.eclipse.xsd.ecore.importer"> + <foreignModel>lob.xsd</foreignModel> + <genPackages prefix="Lob" basePackage="org.eclipse.emf.teneo.samples.emf.annotations" + resource="XML" disposableProviderFactory="true" ecorePackage="lob.ecore#/"> + <genClasses ecoreClass="lob.ecore#//Person"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute lob.ecore#//Person/id"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute lob.ecore#//Person/name"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute lob.ecore#//Person/address"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute lob.ecore#//Person/photo"/> + </genClasses> + </genPackages> +</genmodel:GenModel> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/model/lob.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/model/lob.xsd index 87e5b4ef0..eb384c307 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/model/lob.xsd +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/model/lob.xsd @@ -5,21 +5,23 @@ <xsd:sequence>
<xsd:element name="id" type="xsd:long">
<xsd:annotation>
- <xsd:appinfo source="http://annotation.elver.org/Id">true</xsd:appinfo>
+ <xsd:appinfo source="teneo.jpa">@Id</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="name" type="xsd:string"/>
<xsd:element name="address" type="xsd:string" minOccurs="0">
<!-- Will be mapped to a 'text' field. -->
<xsd:annotation>
- <xsd:appinfo source="http://annotation.elver.org/Lob">true</xsd:appinfo>
+ <xsd:appinfo source="teneo.jpa">@Lob</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="photo" type="xsd:base64Binary" minOccurs="0">
<!-- Will be mapped to a 'binary' field. -->
<xsd:annotation>
- <xsd:appinfo source="http://annotation.elver.org/Lob">true</xsd:appinfo>
- <xsd:appinfo source="http://annotation.elver.org/Column" ecore:key="length">1000000</xsd:appinfo>
+ <xsd:appinfo source="teneo.jpa"> + @Lob
+ @Column(length=1000000) + </xsd:appinfo>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobAdapterFactory.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobAdapterFactory.java index 824a0de02..4dc4fe663 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobAdapterFactory.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobAdapterFactory.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: LobAdapterFactory.java,v 1.1 2006/07/11 16:57:08 mtaal Exp $
+ * $Id: LobAdapterFactory.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.lob.util;
@@ -15,106 +15,106 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.teneo.samples.emf.annotations.lob.*;
-/**
+/** * <!-- begin-user-doc -->
* The <b>Adapter Factory</b> for the model.
* It provides an adapter <code>createXXX</code> method for each class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage + * @generated */
public class LobAdapterFactory extends AdapterFactoryImpl {
- /**
- * The cached model package.
+ /** + * The cached model package. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
protected static LobPackage modelPackage;
- /**
- * Creates an instance of the adapter factory.
+ /** + * Creates an instance of the adapter factory. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public LobAdapterFactory() {
- if (modelPackage == null) {
- modelPackage = LobPackage.eINSTANCE;
- }
- }
-
- /**
- * Returns whether this factory is applicable for the type of the object.
+ public LobAdapterFactory() { + if (modelPackage == null) { + modelPackage = LobPackage.eINSTANCE; + } + } + + /** + * Returns whether this factory is applicable for the type of the object. * <!-- begin-user-doc -->
* This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
* <!-- end-user-doc -->
- * @return whether this factory is applicable for the type of the object.
- * @generated
+ * @return whether this factory is applicable for the type of the object. + * @generated */
- public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
- return true;
- }
- if (object instanceof EObject) {
- return ((EObject)object).eClass().getEPackage() == modelPackage;
- }
- return false;
- }
-
- /**
- * The switch the delegates to the <code>createXXX</code> methods.
+ public boolean isFactoryForType(Object object) { + if (object == modelPackage) { + return true; + } + if (object instanceof EObject) { + return ((EObject)object).eClass().getEPackage() == modelPackage; + } + return false; + } + + /** + * The switch the delegates to the <code>createXXX</code> methods. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- protected LobSwitch modelSwitch =
- new LobSwitch() {
- public Object casePerson(Person object) {
- return createPersonAdapter();
- }
- public Object defaultCase(EObject object) {
- return createEObjectAdapter();
- }
+ protected LobSwitch modelSwitch = + new LobSwitch() { + public Object casePerson(Person object) { + return createPersonAdapter(); + } + public Object defaultCase(EObject object) { + return createEObjectAdapter(); + } };
- /**
- * Creates an adapter for the <code>target</code>.
+ /** + * Creates an adapter for the <code>target</code>. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param target the object to adapt.
- * @return the adapter for the <code>target</code>.
- * @generated
+ * @param target the object to adapt. + * @return the adapter for the <code>target</code>. + * @generated */
- public Adapter createAdapter(Notifier target) {
- return (Adapter)modelSwitch.doSwitch((EObject)target);
- }
-
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person <em>Person</em>}'.
+ public Adapter createAdapter(Notifier target) { + return (Adapter)modelSwitch.doSwitch((EObject)target); + } + + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.lob.Person <em>Person</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.emf.teneo.samples.emf.annotations.lob.Person
- * @generated
+ * @return the new adapter. + * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.Person + * @generated */
- public Adapter createPersonAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for the default case.
+ public Adapter createPersonAdapter() { + return null; + } + + /** + * Creates a new adapter for the default case. * <!-- begin-user-doc -->
* This default implementation returns null.
* <!-- end-user-doc -->
- * @return the new adapter.
- * @generated
+ * @return the new adapter. + * @generated */
- public Adapter createEObjectAdapter() {
- return null;
- }
-
+ public Adapter createEObjectAdapter() { + return null; + } + } //LobAdapterFactory
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobResourceFactoryImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobResourceFactoryImpl.java index 389232deb..03380ddb3 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobResourceFactoryImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobResourceFactoryImpl.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: LobResourceFactoryImpl.java,v 1.1 2006/07/11 16:57:08 mtaal Exp $
+ * $Id: LobResourceFactoryImpl.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.lob.util;
@@ -14,42 +14,42 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl; import org.eclipse.emf.ecore.xmi.XMLResource;
-/**
+/** * <!-- begin-user-doc -->
* The <b>Resource Factory</b> associated with the package.
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.util.LobResourceImpl
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.util.LobResourceImpl + * @generated */
public class LobResourceFactoryImpl extends ResourceFactoryImpl {
- /**
- * Creates an instance of the resource factory.
+ /** + * Creates an instance of the resource factory. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public LobResourceFactoryImpl() {
- super();
- }
-
- /**
- * Creates an instance of the resource.
+ public LobResourceFactoryImpl() { + super(); + } + + /** + * Creates an instance of the resource. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public Resource createResource(URI uri) {
- XMLResource result = new LobResourceImpl(uri);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
- result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-
- result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-
- result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-
- result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
- return result;
- }
-
+ public Resource createResource(URI uri) { + XMLResource result = new LobResourceImpl(uri); + result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE); + result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE); + + result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE); + + result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE); + result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE); + + result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE); + return result; + } + } //LobResourceFactoryImpl
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobResourceImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobResourceImpl.java index b2a55bb2b..42ec2a078 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobResourceImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobResourceImpl.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: LobResourceImpl.java,v 1.1 2006/07/11 16:57:08 mtaal Exp $
+ * $Id: LobResourceImpl.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.lob.util;
@@ -10,23 +10,23 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-/**
+/** * <!-- begin-user-doc -->
* The <b>Resource </b> associated with the package.
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.util.LobResourceFactoryImpl
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.util.LobResourceFactoryImpl + * @generated */
public class LobResourceImpl extends XMLResourceImpl {
- /**
- * Creates an instance of the resource.
+ /** + * Creates an instance of the resource. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param uri the URI of the new resource.
- * @generated
+ * @param uri the URI of the new resource. + * @generated */
- public LobResourceImpl(URI uri) {
- super(uri);
- }
-
+ public LobResourceImpl(URI uri) { + super(uri); + } + } //LobResourceImpl
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobSwitch.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobSwitch.java index 14b0cdf44..2f0a215b4 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobSwitch.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobSwitch.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: LobSwitch.java,v 1.1 2006/07/11 16:57:08 mtaal Exp $
+ * $Id: LobSwitch.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.lob.util;
@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.teneo.samples.emf.annotations.lob.*;
-/**
+/** * <!-- begin-user-doc -->
* The <b>Switch</b> for the model's inheritance hierarchy.
* It supports the call {@link #doSwitch(EObject) doSwitch(object)}
@@ -23,108 +23,108 @@ import org.eclipse.emf.teneo.samples.emf.annotations.lob.*; * until a non-null result is returned,
* which is the result of the switch.
* <!-- end-user-doc -->
- * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage
- * @generated
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage + * @generated */
public class LobSwitch {
- /**
- * The cached model package
+ /** + * The cached model package * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
protected static LobPackage modelPackage;
- /**
- * Creates an instance of the switch.
+ /** + * Creates an instance of the switch. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public LobSwitch() {
- if (modelPackage == null) {
- modelPackage = LobPackage.eINSTANCE;
- }
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+ public LobSwitch() { + if (modelPackage == null) { + modelPackage = LobPackage.eINSTANCE; + } + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
+ * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated */
- public Object doSwitch(EObject theEObject) {
- return doSwitch(theEObject.eClass(), theEObject);
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+ public Object doSwitch(EObject theEObject) { + return doSwitch(theEObject.eClass(), theEObject); + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
+ * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated */
- protected Object doSwitch(EClass theEClass, EObject theEObject) {
- if (theEClass.eContainer() == modelPackage) {
- return doSwitch(theEClass.getClassifierID(), theEObject);
- }
- else {
- List eSuperTypes = theEClass.getESuperTypes();
- return
- eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch((EClass)eSuperTypes.get(0), theEObject);
- }
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+ protected Object doSwitch(EClass theEClass, EObject theEObject) { + if (theEClass.eContainer() == modelPackage) { + return doSwitch(theEClass.getClassifierID(), theEObject); + } + else { + List eSuperTypes = theEClass.getESuperTypes(); + return + eSuperTypes.isEmpty() ? + defaultCase(theEObject) : + doSwitch((EClass)eSuperTypes.get(0), theEObject); + } + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
+ * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated */
- protected Object doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case LobPackage.PERSON: {
- Person person = (Person)theEObject;
- Object result = casePerson(person);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default: return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Person</em>'.
+ protected Object doSwitch(int classifierID, EObject theEObject) { + switch (classifierID) { + case LobPackage.PERSON: { + Person person = (Person)theEObject; + Object result = casePerson(person); + if (result == null) result = defaultCase(theEObject); + return result; + } + default: return defaultCase(theEObject); + } + } + + /** + * Returns the result of interpretting the object as an instance of '<em>Person</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>Person</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
+ * @param object the target of the switch. + * @return the result of interpretting the object as an instance of '<em>Person</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated */
- public Object casePerson(Person object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
+ public Object casePerson(Person object) { + return null; + } + + /** + * Returns the result of interpretting the object as an instance of '<em>EObject</em>'. * <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch, but this is the last case anyway.
* <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject)
- * @generated
+ * @param object the target of the switch. + * @return the result of interpretting the object as an instance of '<em>EObject</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) + * @generated */
- public Object defaultCase(EObject object) {
- return null;
- }
-
+ public Object defaultCase(EObject object) { + return null; + } + } //LobSwitch
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobXMLProcessor.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobXMLProcessor.java index b21e6f9c6..b4006ae75 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobXMLProcessor.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/lob/util/LobXMLProcessor.java @@ -2,7 +2,7 @@ * <copyright>
* </copyright>
*
- * $Id: LobXMLProcessor.java,v 1.1 2006/07/11 16:57:08 mtaal Exp $
+ * $Id: LobXMLProcessor.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $
*/
package org.eclipse.emf.teneo.samples.emf.annotations.lob.util;
@@ -14,37 +14,37 @@ import org.eclipse.emf.ecore.xmi.util.XMLProcessor; import org.eclipse.emf.teneo.samples.emf.annotations.lob.LobPackage;
-/**
- * This class contains helper methods to serialize and deserialize XML documents
+/** + * This class contains helper methods to serialize and deserialize XML documents * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
public class LobXMLProcessor extends XMLProcessor {
- /**
- * Public constructor to instantiate the helper.
+ /** + * Public constructor to instantiate the helper. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- public LobXMLProcessor() {
- super((EPackage.Registry.INSTANCE));
- LobPackage.eINSTANCE.eClass();
- }
-
- /**
- * Register for "*" and "xml" file extensions the LobResourceFactoryImpl factory.
+ public LobXMLProcessor() { + super((EPackage.Registry.INSTANCE)); + LobPackage.eINSTANCE.eClass(); + } + + /** + * Register for "*" and "xml" file extensions the LobResourceFactoryImpl factory. * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated */
- protected Map getRegistrations() {
- if (registrations == null) {
- super.getRegistrations();
- registrations.put(XML_EXTENSION, new LobResourceFactoryImpl());
- registrations.put(STAR_EXTENSION, new LobResourceFactoryImpl());
- }
- return registrations;
- }
-
+ protected Map getRegistrations() { + if (registrations == null) { + super.getRegistrations(); + registrations.put(XML_EXTENSION, new LobResourceFactoryImpl()); + registrations.put(STAR_EXTENSION, new LobResourceFactoryImpl()); + } + return registrations; + } + } //LobXMLProcessor
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/Document.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/Document.java index 6dca1430f..f3a531e47 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/Document.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/Document.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Document.java,v 1.1 2006/07/11 16:57:16 mtaal Exp $ + * $Id: Document.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass; @@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject; * </p> * * @see org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.MappedsuperclassPackage#getDocument() - * @model annotation="http://annotation.elver.org/MappedSuperclass appinfo='true'" + * @model annotation="teneo.jpa appinfo='@MappedSuperclass'" * extendedMetaData="name='Document' kind='elementOnly'" * @generated */ @@ -41,7 +41,7 @@ public interface Document extends EObject { * @see #setMyId(long) * @see org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.MappedsuperclassPackage#getDocument_MyId() * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Long" required="true" - * annotation="http://annotation.elver.org/Id appinfo='true'" + * annotation="teneo.jpa appinfo='@Id'" * extendedMetaData="kind='element' name='myId'" * @generated */ diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/ParentDocument.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/ParentDocument.java index f66e8f166..98a5f7cdf 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/ParentDocument.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/ParentDocument.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ParentDocument.java,v 1.1 2006/07/11 16:57:16 mtaal Exp $ + * $Id: ParentDocument.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass; @@ -20,7 +20,7 @@ package org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass; * </p> * * @see org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.MappedsuperclassPackage#getParentDocument() - * @model annotation="http://annotation.elver.org/MappedSuperclass appinfo='true'" + * @model annotation="teneo.jpa appinfo='@MappedSuperclass'" * extendedMetaData="name='ParentDocument' kind='elementOnly'" * @generated */ diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/impl/MappedsuperclassPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/impl/MappedsuperclassPackageImpl.java index 703aa338e..5d851f97c 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/impl/MappedsuperclassPackageImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/impl/MappedsuperclassPackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: MappedsuperclassPackageImpl.java,v 1.1 2006/07/11 16:56:58 mtaal Exp $ + * $Id: MappedsuperclassPackageImpl.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl; @@ -266,33 +266,37 @@ public class MappedsuperclassPackageImpl extends EPackageImpl implements Mappeds createResource(eNS_URI); // Create annotations - // http://annotation.elver.org/MappedSuperclass - createMappedSuperclassAnnotations(); + // teneo.jpa + createTeneoAnnotations(); // http:///org/eclipse/emf/ecore/util/ExtendedMetaData createExtendedMetaDataAnnotations(); - // http://annotation.elver.org/Id - createIdAnnotations(); } /** - * Initializes the annotations for <b>http://annotation.elver.org/MappedSuperclass</b>. + * Initializes the annotations for <b>teneo.jpa</b>. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected void createMappedSuperclassAnnotations() { - String source = "http://annotation.elver.org/MappedSuperclass"; + protected void createTeneoAnnotations() { + String source = "teneo.jpa"; addAnnotation (documentEClass, source, new String[] { - "appinfo", "true" - }); + "appinfo", "@MappedSuperclass" + }); + addAnnotation + (getDocument_MyId(), + source, + new String[] { + "appinfo", "@Id" + }); addAnnotation (parentDocumentEClass, source, new String[] { - "appinfo", "true" + "appinfo", "@MappedSuperclass" }); } @@ -355,20 +359,4 @@ public class MappedsuperclassPackageImpl extends EPackageImpl implements Mappeds }); } - /** - * Initializes the annotations for <b>http://annotation.elver.org/Id</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void createIdAnnotations() { - String source = "http://annotation.elver.org/Id"; - addAnnotation - (getDocument_MyId(), - source, - new String[] { - "appinfo", "true" - }); - } - } //MappedsuperclassPackageImpl diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/model/mappedsuperclass.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/model/mappedsuperclass.ecore index e5a389927..3cf8d0c2a 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/model/mappedsuperclass.ecore +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/model/mappedsuperclass.ecore @@ -2,10 +2,11 @@ <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="mappedsuperclass" - nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclass" nsPrefix="mappedsuperclass"> + nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclass" + nsPrefix="mappedsuperclass"> <eClassifiers xsi:type="ecore:EClass" name="Document"> - <eAnnotations source="http://annotation.elver.org/MappedSuperclass"> - <details key="appinfo" value="true"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@MappedSuperclass"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="name" value="Document"/> @@ -13,8 +14,8 @@ </eAnnotations> <eStructuralFeatures xsi:type="ecore:EAttribute" name="myId" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Long" unsettable="true"> - <eAnnotations source="http://annotation.elver.org/Id"> - <details key="appinfo" value="true"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Id"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> @@ -30,8 +31,8 @@ </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="ParentDocument" eSuperTypes="#//Document"> - <eAnnotations source="http://annotation.elver.org/MappedSuperclass"> - <details key="appinfo" value="true"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@MappedSuperclass"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="name" value="ParentDocument"/> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/model/mps.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/model/mps.xsd index f5dcdc1bb..c1feb98ea 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/model/mps.xsd +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/mappedsuperclass/model/mps.xsd @@ -6,12 +6,12 @@ <xsd:complexType name="Document"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/MappedSuperclass">true</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@MappedSuperclass</xsd:appinfo> </xsd:annotation> <xsd:sequence> <xsd:element name="myId" type="xsd:long"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/Id">true</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@Id</xsd:appinfo> </xsd:annotation> </xsd:element> <xsd:element name="myGenericInfo" type="xsd:string"/> @@ -20,7 +20,7 @@ <xsd:complexType name="ParentDocument"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/MappedSuperclass">true</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@MappedSuperclass</xsd:appinfo> </xsd:annotation> <xsd:complexContent> <xsd:extension base="this:Document"> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/MyItem.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/MyItem.java index 3122477d3..d9633d4ce 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/MyItem.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/MyItem.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: MyItem.java,v 1.1 2006/07/11 16:56:59 mtaal Exp $ + * $Id: MyItem.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.nmset; @@ -68,7 +68,7 @@ public interface MyItem extends EObject { * @see org.eclipse.emf.teneo.samples.emf.annotations.nmset.NmsetPackage#getMyItem_YourItem() * @see org.eclipse.emf.teneo.samples.emf.annotations.nmset.YourItem#getMyItem * @model type="org.eclipse.emf.teneo.samples.emf.annotations.nmset.YourItem" opposite="myItem" required="true" - * annotation="http://annotation.elver.org/Indexed value='false'" + * annotation="teneo.jpa appinfo='@ManyToMany(Indexed=false)'" * extendedMetaData="kind='element' name='yourItem'" * @generated */ diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/YourItem.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/YourItem.java index 094c72455..1d338d60f 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/YourItem.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/YourItem.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: YourItem.java,v 1.1 2006/07/11 16:56:59 mtaal Exp $ + * $Id: YourItem.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.nmset; @@ -68,7 +68,7 @@ public interface YourItem extends EObject { * @see org.eclipse.emf.teneo.samples.emf.annotations.nmset.NmsetPackage#getYourItem_MyItem() * @see org.eclipse.emf.teneo.samples.emf.annotations.nmset.MyItem#getYourItem * @model type="org.eclipse.emf.teneo.samples.emf.annotations.nmset.MyItem" opposite="yourItem" required="true" - * annotation="http://facet.elver.org/Indexed value='false'" + * annotation="teneo.jpa appinfo='@ManyToMany(Indexed=false)'" * extendedMetaData="kind='element' name='myItem'" * @generated */ diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/impl/NmsetFactoryImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/impl/NmsetFactoryImpl.java index 09de2c6e6..3644ef67a 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/impl/NmsetFactoryImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/impl/NmsetFactoryImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: NmsetFactoryImpl.java,v 1.2 2006/07/22 13:01:18 mtaal Exp $ + * $Id: NmsetFactoryImpl.java,v 1.3 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl; @@ -11,6 +11,8 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.impl.EFactoryImpl; import org.eclipse.emf.ecore.plugin.EcorePlugin; +import org.eclipse.emf.teneo.samples.emf.annotations.nmset.*; + import org.eclipse.emf.teneo.samples.emf.annotations.nmset.MyItem; import org.eclipse.emf.teneo.samples.emf.annotations.nmset.NmsetFactory; import org.eclipse.emf.teneo.samples.emf.annotations.nmset.NmsetPackage; diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/impl/NmsetPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/impl/NmsetPackageImpl.java index 28f308d0b..21b77fe92 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/impl/NmsetPackageImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/impl/NmsetPackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: NmsetPackageImpl.java,v 1.2 2006/07/22 13:01:18 mtaal Exp $ + * $Id: NmsetPackageImpl.java,v 1.3 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl; @@ -243,8 +243,8 @@ public class NmsetPackageImpl extends EPackageImpl implements NmsetPackage { // Create annotations // http:///org/eclipse/emf/ecore/util/ExtendedMetaData createExtendedMetaDataAnnotations(); - // http://annotation.elver.org/Indexed - createIndexedAnnotations(); + // teneo.jpa + createTeneoAnnotations(); } /** @@ -300,19 +300,25 @@ public class NmsetPackageImpl extends EPackageImpl implements NmsetPackage { } /** - * Initializes the annotations for <b>http://annotation.elver.org/Indexed</b>. + * Initializes the annotations for <b>teneo.jpa</b>. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected void createIndexedAnnotations() { - String source = "http://annotation.elver.org/Indexed"; + protected void createTeneoAnnotations() { + String source = "teneo.jpa"; addAnnotation (getMyItem_YourItem(), source, new String[] { - "value", "false" + "appinfo", "@ManyToMany(Indexed=false)" }); + addAnnotation + (getYourItem_MyItem(), + source, + new String[] { + "appinfo", "@ManyToMany(Indexed=false)" + }); } } //NmsetPackageImpl diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/model/NMSet.genmodel b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/model/NMSet.genmodel index e20cd072e..4409cb418 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/model/NMSet.genmodel +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/model/NMSet.genmodel @@ -4,8 +4,8 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.teneo.samples/src" modelPluginID="org.eclipse.emf.teneo.samples" modelName="NMSet" importerID="org.eclipse.xsd.ecore.importer"> <foreignModel>NMSet.xsd</foreignModel> - <genPackages prefix="Nmset" basePackage="org.eclipse.emf.teneo.samples.emf.annotations" resource="XML" - disposableProviderFactory="true" ecorePackage="nmset.ecore#/"> + <genPackages prefix="Nmset" basePackage="org.eclipse.emf.teneo.samples.emf.annotations" + resource="XML" disposableProviderFactory="true" ecorePackage="nmset.ecore#/"> <genClasses ecoreClass="nmset.ecore#//MyItem"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nmset.ecore#//MyItem/name"/> <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference nmset.ecore#//MyItem/yourItem"/> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/model/NMSet.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/model/NMSet.xsd index c4209227b..a754076ff 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/model/NMSet.xsd +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/model/NMSet.xsd @@ -12,7 +12,7 @@ <xsd:element name="yourItem" type="xsd:anyURI" ecore:reference="this:YourItem" ecore:opposite="myItem" maxOccurs="unbounded"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/Indexed" ecore:key="value">false</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@ManyToMany(Indexed=false)</xsd:appinfo> </xsd:annotation> </xsd:element> </xsd:sequence> @@ -25,7 +25,7 @@ ecore:reference="this:MyItem" ecore:opposite="yourItem" maxOccurs="unbounded"> <xsd:annotation> <!-- facet.elver.org is maintained for backwards compatibility --> - <xsd:appinfo source="http://annotation.elver.org/Indexed" ecore:key="value">false</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@ManyToMany(Indexed=false)</xsd:appinfo> </xsd:annotation> </xsd:element> </xsd:sequence> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/model/nmset.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/model/nmset.ecore index fe8521ad2..3b198b4f7 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/model/nmset.ecore +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/nmset/model/nmset.ecore @@ -17,8 +17,8 @@ </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="yourItem" lowerBound="1" upperBound="-1" eType="#//YourItem" eOpposite="#//YourItem/myItem"> - <eAnnotations source="http://annotation.elver.org/Indexed"> - <details key="value" value="false"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@ManyToMany(Indexed=false)"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> @@ -40,8 +40,8 @@ </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="myItem" lowerBound="1" upperBound="-1" eType="#//MyItem" eOpposite="#//MyItem/yourItem"> - <eAnnotations source="http://annotation.elver.org/Indexed"> - <details key="value" value="false"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@ManyToMany(Indexed=false)"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/Person.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/Person.java index f14323a22..e48151774 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/Person.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/Person.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Person.java,v 1.1 2006/07/11 16:57:07 mtaal Exp $ + * $Id: Person.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.toone; @@ -38,7 +38,7 @@ public interface Person extends EObject { * @see #setAddress(Address) * @see org.eclipse.emf.teneo.samples.emf.annotations.toone.ToonePackage#getPerson_Address() * @model resolveProxies="false" - * annotation="http://annotation.elver.org/ManyToOne fetch='EAGER' cascade='MERGE PERSIST REFRESH' targetEntity='Address' optional='true'" + * annotation="teneo.jpa appinfo='@ManyToOne(fetch=EAGER cascade={MERGE,PERSIST,REFRESH} targetEntity=\"Address\" optional=true)'" * extendedMetaData="kind='element' name='address'" * @generated */ @@ -68,7 +68,7 @@ public interface Person extends EObject { * @see org.eclipse.emf.teneo.samples.emf.annotations.toone.ToonePackage#getPerson_Head() * @see org.eclipse.emf.teneo.samples.emf.annotations.toone.Head#getPerson * @model opposite="person" resolveProxies="false" - * annotation="http://annotation.elver.org/OneToOne fetch='EAGER' cascade='ALL' targetEntity='Head' optional='true'" + * annotation="teneo.jpa appinfo='@OneToOne(fetch=EAGER cascade=ALL targetEntity=\"Head\" optional=true)'" * extendedMetaData="kind='element' name='head'" * @generated */ diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/impl/ToonePackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/impl/ToonePackageImpl.java index d6a68494c..8dc35421a 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/impl/ToonePackageImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/impl/ToonePackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ToonePackageImpl.java,v 1.1 2006/07/11 16:56:59 mtaal Exp $ + * $Id: ToonePackageImpl.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.toone.impl; @@ -280,8 +280,8 @@ public class ToonePackageImpl extends EPackageImpl implements ToonePackage { createExtendedMetaDataAnnotations(); // http://annotation.elver.org/OneToOne createOneToOneAnnotations(); - // http://annotation.elver.org/ManyToOne - createManyToOneAnnotations(); + // teneo.jpa + createTeneoAnnotations(); } /** @@ -368,34 +368,28 @@ public class ToonePackageImpl extends EPackageImpl implements ToonePackage { "optional", "false", "mappedBy", "head" }); - addAnnotation - (getPerson_Head(), - source, - new String[] { - "fetch", "EAGER", - "cascade", "ALL", - "targetEntity", "Head", - "optional", "true" - }); } /** - * Initializes the annotations for <b>http://annotation.elver.org/ManyToOne</b>. + * Initializes the annotations for <b>teneo.jpa</b>. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected void createManyToOneAnnotations() { - String source = "http://annotation.elver.org/ManyToOne"; + protected void createTeneoAnnotations() { + String source = "teneo.jpa"; addAnnotation (getPerson_Address(), source, new String[] { - "fetch", "EAGER", - "cascade", "MERGE PERSIST REFRESH", - "targetEntity", "Address", - "optional", "true" + "appinfo", "@ManyToOne(fetch=EAGER cascade={MERGE,PERSIST,REFRESH} targetEntity=\"Address\" optional=true)" }); + addAnnotation + (getPerson_Head(), + source, + new String[] { + "appinfo", "@OneToOne(fetch=EAGER cascade=ALL targetEntity=\"Head\" optional=true)" + }); } } //ToonePackageImpl diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/model/toone.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/model/toone.ecore index bce3e42aa..48069eefd 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/model/toone.ecore +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/model/toone.ecore @@ -50,11 +50,8 @@ </eAnnotations> <eStructuralFeatures xsi:type="ecore:EReference" name="address" eType="#//Address" resolveProxies="false"> - <eAnnotations source="http://annotation.elver.org/ManyToOne"> - <details key="fetch" value="EAGER"/> - <details key="cascade" value="MERGE PERSIST REFRESH"/> - <details key="targetEntity" value="Address"/> - <details key="optional" value="true"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@ManyToOne(fetch=EAGER cascade={MERGE,PERSIST,REFRESH} targetEntity="Address" optional=true)"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> @@ -63,11 +60,8 @@ </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="head" eType="#//Head" resolveProxies="false" eOpposite="#//Head/person"> - <eAnnotations source="http://annotation.elver.org/OneToOne"> - <details key="fetch" value="EAGER"/> - <details key="cascade" value="ALL"/> - <details key="targetEntity" value="Head"/> - <details key="optional" value="true"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@OneToOne(fetch=EAGER cascade=ALL targetEntity="Head" optional=true)"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/model/toone.genmodel b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/model/toone.genmodel index e09ff63ff..1d6f23222 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/model/toone.genmodel +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/model/toone.genmodel @@ -4,8 +4,8 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.teneo.samples/src" modelPluginID="org.eclipse.emf.teneo.samples" modelName="Toone" importerID="org.eclipse.xsd.ecore.importer"> <foreignModel>toone.xsd</foreignModel> - <genPackages prefix="Toone" basePackage="org.eclipse.emf.teneo.samples.emf.annotations" resource="XML" - disposableProviderFactory="true" ecorePackage="toone.ecore#/"> + <genPackages prefix="Toone" basePackage="org.eclipse.emf.teneo.samples.emf.annotations" + resource="XML" disposableProviderFactory="true" ecorePackage="toone.ecore#/"> <genClasses ecoreClass="toone.ecore#//Address"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute toone.ecore#//Address/city"/> </genClasses> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/model/toone.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/model/toone.xsd index 3350038d7..8ef254673 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/model/toone.xsd +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/toone/model/toone.xsd @@ -8,18 +8,12 @@ <xsd:sequence> <xsd:element name="address" type="xsd:IDREF" ecore:reference="this:Address" minOccurs="0"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/ManyToOne" ecore:key="fetch">EAGER</xsd:appinfo> - <xsd:appinfo source="http://annotation.elver.org/ManyToOne" ecore:key="cascade">MERGE PERSIST REFRESH</xsd:appinfo> - <xsd:appinfo source="http://annotation.elver.org/ManyToOne" ecore:key="targetEntity">Address</xsd:appinfo> - <xsd:appinfo source="http://annotation.elver.org/ManyToOne" ecore:key="optional">true</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@ManyToOne(fetch=EAGER cascade={MERGE,PERSIST,REFRESH} targetEntity="Address" optional=true)</xsd:appinfo> </xsd:annotation> </xsd:element> <xsd:element name="head" type="xsd:IDREF" ecore:reference="this:Head" minOccurs="0" ecore:opposite="person"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/OneToOne" ecore:key="fetch">EAGER</xsd:appinfo> - <xsd:appinfo source="http://annotation.elver.org/OneToOne" ecore:key="cascade">ALL</xsd:appinfo> - <xsd:appinfo source="http://annotation.elver.org/OneToOne" ecore:key="targetEntity">Head</xsd:appinfo> - <xsd:appinfo source="http://annotation.elver.org/OneToOne" ecore:key="optional">true</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@OneToOne(fetch=EAGER cascade=ALL targetEntity="Head" optional=true)</xsd:appinfo> </xsd:annotation> </xsd:element> </xsd:sequence> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/Body.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/Body.java index 9535b3620..283a880ef 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/Body.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/Body.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Body.java,v 1.1 2006/07/11 16:56:55 mtaal Exp $ + * $Id: Body.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.transent; @@ -40,7 +40,7 @@ public interface Body extends EObject { * @see #setTheID(long) * @see org.eclipse.emf.teneo.samples.emf.annotations.transent.TransentPackage#getBody_TheID() * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Long" required="true" - * annotation="http://annotation.elver.org/Id appinfo='true'" + * annotation="teneo.jpa appinfo='@Id'" * extendedMetaData="kind='element' name='theID'" * @generated */ @@ -92,8 +92,8 @@ public interface Body extends EObject { * @return the value of the '<em>Head</em>' containment reference. * @see #setHead(Head) * @see org.eclipse.emf.teneo.samples.emf.annotations.transent.TransentPackage#getBody_Head() - * @model containment="true" resolveProxies="false" required="true" - * annotation="http://annotation.elver.org/Transient appinfo='true'" + * @model containment="true" required="true" + * annotation="teneo.jpa appinfo='@Transient'" * extendedMetaData="kind='element' name='head'" * @generated */ diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/Head.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/Head.java index 222ba7584..d47b11e01 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/Head.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/Head.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Head.java,v 1.1 2006/07/11 16:56:55 mtaal Exp $ + * $Id: Head.java,v 1.2 2006/09/29 12:30:04 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.transent; @@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.EObject; * </p> * * @see org.eclipse.emf.teneo.samples.emf.annotations.transent.TransentPackage#getHead() - * @model annotation="http://annotation.elver.org/Transient appinfo='true'" + * @model annotation="teneo.jpa appinfo='@Transient'" * extendedMetaData="name='Head' kind='elementOnly'" * @generated */ @@ -40,7 +40,7 @@ public interface Head extends EObject { * @see #setMyID(long) * @see org.eclipse.emf.teneo.samples.emf.annotations.transent.TransentPackage#getHead_MyID() * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Long" required="true" - * annotation="http://annotation.elver.org/Id appinfo='true'" + * annotation="teneo.jpa appinfo='@Id'" * extendedMetaData="kind='element' name='myID'" * @generated */ diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/impl/TransentPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/impl/TransentPackageImpl.java index 8f00968aa..b17b99990 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/impl/TransentPackageImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/impl/TransentPackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: TransentPackageImpl.java,v 1.1 2006/07/11 16:57:09 mtaal Exp $ + * $Id: TransentPackageImpl.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.transent.impl; @@ -235,10 +235,8 @@ public class TransentPackageImpl extends EPackageImpl implements TransentPackage // Create annotations // http:///org/eclipse/emf/ecore/util/ExtendedMetaData createExtendedMetaDataAnnotations(); - // http://annotation.elver.org/Id - createIdAnnotations(); - // http://annotation.elver.org/Transient - createTransientAnnotations(); + // teneo.jpa + createTeneoAnnotations(); } /** @@ -287,47 +285,37 @@ public class TransentPackageImpl extends EPackageImpl implements TransentPackage } /** - * Initializes the annotations for <b>http://annotation.elver.org/Id</b>. + * Initializes the annotations for <b>teneo.jpa</b>. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected void createIdAnnotations() { - String source = "http://annotation.elver.org/Id"; + protected void createTeneoAnnotations() { + String source = "teneo.jpa"; addAnnotation (getBody_TheID(), source, new String[] { - "appinfo", "true" - }); - addAnnotation - (getHead_MyID(), - source, - new String[] { - "appinfo", "true" - }); - } - - /** - * Initializes the annotations for <b>http://annotation.elver.org/Transient</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void createTransientAnnotations() { - String source = "http://annotation.elver.org/Transient"; + "appinfo", "@Id" + }); addAnnotation (getBody_Head(), source, new String[] { - "appinfo", "true" + "appinfo", "@Transient" }); addAnnotation (headEClass, source, new String[] { - "appinfo", "true" + "appinfo", "@Transient" }); + addAnnotation + (getHead_MyID(), + source, + new String[] { + "appinfo", "@Id" + }); } } //TransentPackageImpl diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/model/transent.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/model/transent.ecore index d021a8762..08f72f215 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/model/transent.ecore +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/model/transent.ecore @@ -10,8 +10,8 @@ </eAnnotations> <eStructuralFeatures xsi:type="ecore:EAttribute" name="theID" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Long" unsettable="true"> - <eAnnotations source="http://annotation.elver.org/Id"> - <details key="appinfo" value="true"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Id"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> @@ -20,8 +20,8 @@ </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="head" lowerBound="1" eType="#//Head" containment="true" resolveProxies="false"> - <eAnnotations source="http://annotation.elver.org/Transient"> - <details key="appinfo" value="true"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Transient"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> @@ -30,8 +30,8 @@ </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Head"> - <eAnnotations source="http://annotation.elver.org/Transient"> - <details key="appinfo" value="true"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Transient"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="name" value="Head"/> @@ -39,8 +39,8 @@ </eAnnotations> <eStructuralFeatures xsi:type="ecore:EAttribute" name="myID" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Long" unsettable="true"> - <eAnnotations source="http://annotation.elver.org/Id"> - <details key="appinfo" value="true"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Id"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/model/transent.genmodel b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/model/transent.genmodel index 9d01a3d9f..f0163ab27 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/model/transent.genmodel +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/model/transent.genmodel @@ -4,8 +4,8 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.teneo.samples/src" modelPluginID="org.eclipse.emf.teneo.samples" modelName="Transent" importerID="org.eclipse.xsd.ecore.importer"> <foreignModel>transent.xsd</foreignModel> - <genPackages prefix="Transent" basePackage="org.eclipse.emf.teneo.samples.emf.annotations" resource="XML" - disposableProviderFactory="true" ecorePackage="transent.ecore#/"> + <genPackages prefix="Transent" basePackage="org.eclipse.emf.teneo.samples.emf.annotations" + resource="XML" disposableProviderFactory="true" ecorePackage="transent.ecore#/"> <genClasses ecoreClass="transent.ecore#//Body"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute transent.ecore#//Body/theID"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference transent.ecore#//Body/head"/> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/model/transent.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/model/transent.xsd index 22b2779ab..1cf40c82a 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/model/transent.xsd +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/transent/model/transent.xsd @@ -8,12 +8,12 @@ <xsd:sequence> <xsd:element name="theID" type="xsd:long"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/Id">true</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@Id</xsd:appinfo> </xsd:annotation> </xsd:element> <xsd:element name="head" type="this:Head" > <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/Transient">true</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@Transient</xsd:appinfo> </xsd:annotation> </xsd:element> </xsd:sequence> @@ -21,12 +21,12 @@ <xsd:complexType name="Head"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/Transient">true</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@Transient</xsd:appinfo> </xsd:annotation> <xsd:sequence> <xsd:element name="myID" type="xsd:long"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/Id">true</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@Id</xsd:appinfo> </xsd:annotation> </xsd:element> </xsd:sequence> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/Item.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/Item.java index 70fd5a727..08a165ee0 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/Item.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/Item.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Item.java,v 1.1 2006/07/11 16:57:09 mtaal Exp $ + * $Id: Item.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints; @@ -22,8 +22,7 @@ import org.eclipse.emf.ecore.EObject; * </p> * * @see org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.UniqueconstraintsPackage#getItem() - * @model annotation="http://annotation.elver.org/Table name='MYITEMTABLE' uniqueConstraints='u1'" - * annotation="http://annotation.elver.org/UniqueConstraint/u1 columnNames='MYSTR MYINT'" + * @model annotation="teneo.jpa appinfo='\n\t\t\t@Table(name=\"MYITEMTABLE\" uniqueConstraints={@UniqueConstraint(columnNames={\"MYSTR\",\"MYINT\"})})'" * extendedMetaData="name='Item' kind='elementOnly'" * @generated */ @@ -40,7 +39,7 @@ public interface Item extends EObject { * @see #setName(String) * @see org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.UniqueconstraintsPackage#getItem_Name() * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true" - * annotation="http://annotation.elver.org/Column name='MYSTR'" + * annotation="teneo.jpa appinfo='@Column(name=\"MYSTR\")'" * extendedMetaData="kind='element' name='name'" * @generated */ @@ -70,7 +69,7 @@ public interface Item extends EObject { * @see #setAge(int) * @see org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.UniqueconstraintsPackage#getItem_Age() * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Int" required="true" - * annotation="http://annotation.elver.org/Column name='MYINT'" + * annotation="teneo.jpa appinfo='@Column(name=\"MYINT\")'" * extendedMetaData="kind='element' name='age'" * @generated */ diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/impl/UniqueconstraintsPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/impl/UniqueconstraintsPackageImpl.java index 5fe540184..a9aa060f2 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/impl/UniqueconstraintsPackageImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/impl/UniqueconstraintsPackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: UniqueconstraintsPackageImpl.java,v 1.1 2006/07/11 16:57:18 mtaal Exp $ + * $Id: UniqueconstraintsPackageImpl.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl; @@ -200,47 +200,38 @@ public class UniqueconstraintsPackageImpl extends EPackageImpl implements Unique createResource(eNS_URI); // Create annotations - // http://annotation.elver.org/Table - createTableAnnotations(); - // http://annotation.elver.org/UniqueConstraint/u1 - createU1Annotations(); + // teneo.jpa + createTeneoAnnotations(); // http:///org/eclipse/emf/ecore/util/ExtendedMetaData createExtendedMetaDataAnnotations(); - // http://annotation.elver.org/Column - createColumnAnnotations(); } /** - * Initializes the annotations for <b>http://annotation.elver.org/Table</b>. + * Initializes the annotations for <b>teneo.jpa</b>. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected void createTableAnnotations() { - String source = "http://annotation.elver.org/Table"; + protected void createTeneoAnnotations() { + String source = "teneo.jpa"; addAnnotation (itemEClass, source, new String[] { - "name", "MYITEMTABLE", - "uniqueConstraints", "u1" - }); - } - - /** - * Initializes the annotations for <b>http://annotation.elver.org/UniqueConstraint/u1</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void createU1Annotations() { - String source = "http://annotation.elver.org/UniqueConstraint/u1"; + "appinfo", "\n\t\t\t@Table(name=\"MYITEMTABLE\" uniqueConstraints={@UniqueConstraint(columnNames={\"MYSTR\",\"MYINT\"})})" + }); addAnnotation - (itemEClass, + (getItem_Name(), + source, + new String[] { + "appinfo", "@Column(name=\"MYSTR\")" + }); + addAnnotation + (getItem_Age(), source, new String[] { - "columnNames", "MYSTR MYINT" - }); + "appinfo", "@Column(name=\"MYINT\")" + }); } /** @@ -250,7 +241,7 @@ public class UniqueconstraintsPackageImpl extends EPackageImpl implements Unique * @generated */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; addAnnotation (itemEClass, source, @@ -274,26 +265,4 @@ public class UniqueconstraintsPackageImpl extends EPackageImpl implements Unique }); } - /** - * Initializes the annotations for <b>http://annotation.elver.org/Column</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void createColumnAnnotations() { - String source = "http://annotation.elver.org/Column"; - addAnnotation - (getItem_Name(), - source, - new String[] { - "name", "MYSTR" - }); - addAnnotation - (getItem_Age(), - source, - new String[] { - "name", "MYINT" - }); - } - } //UniqueconstraintsPackageImpl diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/model/unique.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/model/unique.xsd index af593c938..8fa8011b8 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/model/unique.xsd +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/model/unique.xsd @@ -9,19 +9,18 @@ <xsd:complexType name="Item"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/Table" ecore:key="name">MYITEMTABLE</xsd:appinfo> - <xsd:appinfo source="http://annotation.elver.org/Table" ecore:key="uniqueConstraints">u1</xsd:appinfo> - <xsd:appinfo source="http://annotation.elver.org/UniqueConstraint/u1" ecore:key="columnNames">MYSTR MYINT</xsd:appinfo> + <xsd:appinfo source="teneo.jpa"> + @Table(name="MYITEMTABLE" uniqueConstraints={@UniqueConstraint(columnNames={"MYSTR","MYINT"})})</xsd:appinfo> </xsd:annotation> <xsd:sequence> <xsd:element name="name" type="xsd:string"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/Column" ecore:key="name">MYSTR</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@Column(name="MYSTR")</xsd:appinfo> </xsd:annotation> </xsd:element> <xsd:element name="age" type="xsd:int"> <xsd:annotation> - <xsd:appinfo source="http://annotation.elver.org/Column" ecore:key="name">MYINT</xsd:appinfo> + <xsd:appinfo source="teneo.jpa">@Column(name="MYINT")</xsd:appinfo> </xsd:annotation> </xsd:element> </xsd:sequence> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/model/uniqueconstraints.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/model/uniqueconstraints.ecore index 45c20932f..e4fd341c2 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/model/uniqueconstraints.ecore +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/uniqueconstraints/model/uniqueconstraints.ecore @@ -2,14 +2,11 @@ <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="uniqueconstraints" - nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/uniqueconstraints" nsPrefix="uniqueconstraints"> + nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/uniqueconstraints" + nsPrefix="uniqueconstraints"> <eClassifiers xsi:type="ecore:EClass" name="Item"> - <eAnnotations source="http://annotation.elver.org/Table"> - <details key="name" value="MYITEMTABLE"/> - <details key="uniqueConstraints" value="u1"/> - </eAnnotations> - <eAnnotations source="http://annotation.elver.org/UniqueConstraint/u1"> - <details key="columnNames" value="MYSTR MYINT"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="
			@Table(name="MYITEMTABLE" uniqueConstraints={@UniqueConstraint(columnNames={"MYSTR","MYINT"})})"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="name" value="Item"/> @@ -17,8 +14,8 @@ </eAnnotations> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> - <eAnnotations source="http://annotation.elver.org/Column"> - <details key="name" value="MYSTR"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Column(name="MYSTR")"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> @@ -27,8 +24,8 @@ </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="age" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Int" unsettable="true"> - <eAnnotations source="http://annotation.elver.org/Column"> - <details key="name" value="MYINT"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Column(name="MYINT")"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.ecore index c9b9b5ca0..d80d14e78 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.ecore +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.ecore @@ -124,8 +124,8 @@ </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="long" unique="false" lowerBound="1" upperBound="-1" eType="#//Long"> - <eAnnotations source="http://annotation.elver.org/JoinTable"> - <details key="name" value="longNum"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@JoinTable(name="longNum")"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> @@ -338,8 +338,8 @@ </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="enu" unique="false" lowerBound="1" eType="#//SimpleEnumObject" defaultValueLiteral="Enum1" unsettable="true"> - <eAnnotations source="http://annotation.elver.org/Enumerated"> - <details key="value" value="STRING"/> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="@Enumerated(STRING)"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="kind" value="element"/> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.xsd index 2fdc6900b..208d2e55a 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.xsd +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.xsd @@ -33,7 +33,7 @@ <element name="shor" type="short" nillable="true"/> <element name="enu" type="this:SimpleEnum" nillable="true"> <annotation> - <appinfo source="http://annotation.elver.org/Enumerated" ecore:key="value">STRING</appinfo> + <appinfo source="teneo.jpa">@Enumerated(STRING)</appinfo> </annotation> </element> <element name="dat" type="this:Date" nillable="true"/> @@ -50,7 +50,7 @@ <element name="inte" type="this:Int" maxOccurs="unbounded"/> <element name="long" type="this:Long" maxOccurs="unbounded"> <annotation> - <appinfo source="http://annotation.elver.org/JoinTable" ecore:key="name">longNum</appinfo> + <appinfo source="teneo.jpa">@JoinTable(name="longNum")</appinfo> </annotation> </element> <element name="shor" type="short" maxOccurs="unbounded"/> diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleList.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleList.java index 9cba08c05..8face89eb 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleList.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleList.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: SimpleList.java,v 1.2 2006/09/22 13:58:33 mtaal Exp $ + * $Id: SimpleList.java,v 1.3 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes; @@ -192,7 +192,7 @@ public interface SimpleList extends EObject { * @return the value of the '<em>Long</em>' attribute list. * @see org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpletypesPackage#getSimpleList_Long() * @model type="java.lang.Long" unique="false" dataType="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.Long" required="true" - * annotation="http://annotation.elver.org/JoinTable name='longNum'" + * annotation="teneo.jpa appinfo='@JoinTable(name=\"longNum\")'" * extendedMetaData="kind='element' name='long'" * @generated */ diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleTypeObject.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleTypeObject.java index 072e1b33d..b3fdf2774 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleTypeObject.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleTypeObject.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: SimpleTypeObject.java,v 1.1 2006/07/11 16:57:08 mtaal Exp $ + * $Id: SimpleTypeObject.java,v 1.2 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes; @@ -484,7 +484,7 @@ public interface SimpleTypeObject extends EObject { * @see #setEnu(SimpleEnum) * @see org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpletypesPackage#getSimpleTypeObject_Enu() * @model default="Enum1" unique="false" unsettable="true" dataType="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnumObject" required="true" - * annotation="http://annotation.elver.org/Enumerated value='STRING'" + * annotation="teneo.jpa appinfo='@Enumerated(STRING)'" * extendedMetaData="kind='element' name='enu'" * @generated */ diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpletypesPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpletypesPackageImpl.java index 15b09a059..965073736 100644 --- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpletypesPackageImpl.java +++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpletypesPackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: SimpletypesPackageImpl.java,v 1.3 2006/09/22 13:58:33 mtaal Exp $ + * $Id: SimpletypesPackageImpl.java,v 1.4 2006/09/29 12:30:05 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl; @@ -883,10 +883,8 @@ public class SimpletypesPackageImpl extends EPackageImpl implements SimpletypesP // Create annotations // http:///org/eclipse/emf/ecore/util/ExtendedMetaData createExtendedMetaDataAnnotations(); - // http://annotation.elver.org/JoinTable - createJoinTableAnnotations(); - // http://annotation.elver.org/Enumerated - createEnumeratedAnnotations(); + // teneo.jpa + createTeneoAnnotations(); } /** @@ -1253,34 +1251,24 @@ public class SimpletypesPackageImpl extends EPackageImpl implements SimpletypesP } /** - * Initializes the annotations for <b>http://annotation.elver.org/JoinTable</b>. + * Initializes the annotations for <b>teneo.jpa</b>. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected void createJoinTableAnnotations() { - String source = "http://annotation.elver.org/JoinTable"; + protected void createTeneoAnnotations() { + String source = "teneo.jpa"; addAnnotation (getSimpleList_Long(), source, new String[] { - "name", "longNum" - }); - } - - /** - * Initializes the annotations for <b>http://annotation.elver.org/Enumerated</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void createEnumeratedAnnotations() { - String source = "http://annotation.elver.org/Enumerated"; + "appinfo", "@JoinTable(name=\"longNum\")" + }); addAnnotation (getSimpleTypeObject_Enu(), source, new String[] { - "value", "STRING" + "appinfo", "@Enumerated(STRING)" }); } |