diff options
Diffstat (limited to 'tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie')
14 files changed, 66 insertions, 83 deletions
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/CriticsReviewType.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/CriticsReviewType.java index ac1c472bb..dd997cbc1 100644 --- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/CriticsReviewType.java +++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/CriticsReviewType.java @@ -19,11 +19,11 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.emf.test.models.movie.db.CriticsReviewType#getRating <em>Rating</em>}</li> * <li>{@link org.eclipse.emf.test.models.movie.db.CriticsReviewType#getReviewedBy <em>Reviewed By</em>}</li> * </ul> - * </p> * * @see org.eclipse.emf.test.models.movie.db.DBPackage#getCriticsReviewType() * @model extendedMetaData="name='criticsReviewType' kind='elementOnly'" diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/CustomerReviewType.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/CustomerReviewType.java index e5e758503..6817e285b 100644 --- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/CustomerReviewType.java +++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/CustomerReviewType.java @@ -18,10 +18,10 @@ package org.eclipse.emf.test.models.movie.db; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.emf.test.models.movie.db.CustomerReviewType#getComment <em>Comment</em>}</li> * </ul> - * </p> * * @see org.eclipse.emf.test.models.movie.db.DBPackage#getCustomerReviewType() * @model extendedMetaData="name='customerReviewType' kind='elementOnly'" diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/DocumentRoot.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/DocumentRoot.java index f3413020c..4007061c6 100644 --- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/DocumentRoot.java +++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/DocumentRoot.java @@ -22,6 +22,7 @@ import org.eclipse.emf.test.models.customer.CustomerType; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.emf.test.models.movie.db.DocumentRoot#getMixed <em>Mixed</em>}</li> * <li>{@link org.eclipse.emf.test.models.movie.db.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li> @@ -33,7 +34,6 @@ import org.eclipse.emf.test.models.customer.CustomerType; * <li>{@link org.eclipse.emf.test.models.movie.db.DocumentRoot#getMovieDB <em>Movie DB</em>}</li> * <li>{@link org.eclipse.emf.test.models.movie.db.DocumentRoot#getSpecialFeatures <em>Special Features</em>}</li> * </ul> - * </p> * * @see org.eclipse.emf.test.models.movie.db.DBPackage#getDocumentRoot() * @model extendedMetaData="name='' kind='mixed'" diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/GenreTypes.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/GenreTypes.java index 1c4b36ed8..d49391f40 100644 --- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/GenreTypes.java +++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/GenreTypes.java @@ -362,6 +362,8 @@ public enum GenreTypes implements Enumerator * Returns the '<em><b>Genre Types</b></em>' literal with the specified literal value. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param literal the literal. + * @return the matching enumerator or <code>null</code>. * @generated */ public static GenreTypes get(String literal) @@ -381,6 +383,8 @@ public enum GenreTypes implements Enumerator * Returns the '<em><b>Genre Types</b></em>' literal with the specified name. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param name the name. + * @return the matching enumerator or <code>null</code>. * @generated */ public static GenreTypes getByName(String name) @@ -400,6 +404,8 @@ public enum GenreTypes implements Enumerator * Returns the '<em><b>Genre Types</b></em>' literal with the specified integer value. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param value the integer value. + * @return the matching enumerator or <code>null</code>. * @generated */ public static GenreTypes get(int value) diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/MovieDBType.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/MovieDBType.java index cbe902ee1..df433a9bf 100644 --- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/MovieDBType.java +++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/MovieDBType.java @@ -21,12 +21,12 @@ import org.eclipse.emf.ecore.util.FeatureMap; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.emf.test.models.movie.db.MovieDBType#getMovieDBFeatureMap <em>Movie DB Feature Map</em>}</li> * <li>{@link org.eclipse.emf.test.models.movie.db.MovieDBType#getMovie <em>Movie</em>}</li> * <li>{@link org.eclipse.emf.test.models.movie.db.MovieDBType#getComment <em>Comment</em>}</li> * </ul> - * </p> * * @see org.eclipse.emf.test.models.movie.db.DBPackage#getMovieDBType() * @model extendedMetaData="name='movieDBType' kind='elementOnly'" diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/MovieType.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/MovieType.java index 0ab3b77cb..c65ddd314 100644 --- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/MovieType.java +++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/MovieType.java @@ -24,6 +24,7 @@ import org.eclipse.emf.test.models.customer.CustomerType; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.emf.test.models.movie.db.MovieType#getTitle <em>Title</em>}</li> * <li>{@link org.eclipse.emf.test.models.movie.db.MovieType#getActors <em>Actors</em>}</li> @@ -36,7 +37,6 @@ import org.eclipse.emf.test.models.customer.CustomerType; * <li>{@link org.eclipse.emf.test.models.movie.db.MovieType#getAny <em>Any</em>}</li> * <li>{@link org.eclipse.emf.test.models.movie.db.MovieType#getID <em>ID</em>}</li> * </ul> - * </p> * * @see org.eclipse.emf.test.models.movie.db.DBPackage#getMovieType() * @model extendedMetaData="name='movie' kind='elementOnly'" diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/CriticsReviewTypeImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/CriticsReviewTypeImpl.java index 62f679f88..f0e142568 100644 --- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/CriticsReviewTypeImpl.java +++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/CriticsReviewTypeImpl.java @@ -23,11 +23,11 @@ import org.eclipse.emf.test.models.movie.db.DBPackage; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.emf.test.models.movie.db.impl.CriticsReviewTypeImpl#getRating <em>Rating</em>}</li> * <li>{@link org.eclipse.emf.test.models.movie.db.impl.CriticsReviewTypeImpl#getReviewedBy <em>Reviewed By</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/CustomerReviewTypeImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/CustomerReviewTypeImpl.java index 0f6d34c89..d870df66a 100644 --- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/CustomerReviewTypeImpl.java +++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/CustomerReviewTypeImpl.java @@ -22,10 +22,10 @@ import org.eclipse.emf.test.models.movie.db.DBPackage; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.emf.test.models.movie.db.impl.CustomerReviewTypeImpl#getComment <em>Comment</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/DBFactoryImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/DBFactoryImpl.java index c65d3ca36..c25926fa4 100644 --- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/DBFactoryImpl.java +++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/DBFactoryImpl.java @@ -12,8 +12,6 @@ package org.eclipse.emf.test.models.movie.db.impl; import java.util.ArrayList; import java.util.List; -import java.util.StringTokenizer; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; import org.eclipse.emf.ecore.EObject; @@ -49,7 +47,7 @@ public class DBFactoryImpl extends EFactoryImpl implements DBFactory { try { - DBFactory theDBFactory = (DBFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org.eclipse.emf.test.models/MovieDB"); + DBFactory theDBFactory = (DBFactory)EPackage.Registry.INSTANCE.getEFactory(DBPackage.eNS_URI); if (theDBFactory != null) { return theDBFactory; @@ -237,9 +235,8 @@ public class DBFactoryImpl extends EFactoryImpl implements DBFactory { if (initialValue == null) return null; List<String> result = new ArrayList<String>(); - for (StringTokenizer stringTokenizer = new StringTokenizer(initialValue); stringTokenizer.hasMoreTokens(); ) + for (String item : split(initialValue)) { - String item = stringTokenizer.nextToken(); result.add((String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.NC_NAME, item)); } return result; diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/DBPackageImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/DBPackageImpl.java index 26751db8b..86d750f62 100644 --- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/DBPackageImpl.java +++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/DBPackageImpl.java @@ -769,7 +769,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; addAnnotation (actorsListEDataType, source, @@ -777,7 +777,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage { "name", "actorsList", "itemType", "http://www.eclipse.org/emf/2003/XMLType#NCName" - }); + }); addAnnotation (criticsReviewTypeEClass, source, @@ -785,7 +785,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage { "name", "criticsReviewType", "kind", "elementOnly" - }); + }); addAnnotation (getCriticsReviewType_Rating(), source, @@ -793,7 +793,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage { "kind", "element", "name", "rating" - }); + }); addAnnotation (getCriticsReviewType_ReviewedBy(), source, @@ -801,7 +801,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage { "kind", "attribute", "name", "ReviewedBy" - }); + }); addAnnotation (customerReviewTypeEClass, source, @@ -809,7 +809,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage { "name", "customerReviewType", "kind", "elementOnly" - }); + }); addAnnotation (getCustomerReviewType_Comment(), source, @@ -817,7 +817,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage { "kind", "element", "name", "comment" - }); + }); addAnnotation (documentRootEClass, source, @@ -825,7 +825,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage { "name", "", "kind", "mixed" - }); + }); addAnnotation (getDocumentRoot_Mixed(), source, @@ -833,7 +833,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage { "kind", "elementWildcard", "name", ":mixed" - }); + }); addAnnotation (getDocumentRoot_XMLNSPrefixMap(), source, @@ -841,7 +841,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage { "kind", "attribute", "name", "xmlns:prefix" - }); + }); addAnnotation (getDocumentRoot_XSISchemaLocation(), source, @@ -849,7 +849,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage { "kind", "attribute", "name", "xsi:schemaLocation" - }); + }); addAnnotation (getDocumentRoot_CheckedOutBy(), source, @@ -858,7 +858,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage "kind", "element", "name", "checkedOutBy", "namespace", "##targetNamespace" - }); + }); addAnnotation (getDocumentRoot_CriticsReview(), source, @@ -867,7 +867,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage "kind", "element", "name", "criticsReview", "namespace", "##targetNamespace" - }); + }); addAnnotation (getDocumentRoot_CustomerReview(), source, @@ -877,7 +877,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage "name", "customerReview", "namespace", "##targetNamespace", "affiliation", "criticsReview" - }); + }); addAnnotation (getDocumentRoot_Language(), source, @@ -886,7 +886,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage "kind", "element", "name", "language", "namespace", "##targetNamespace" - }); + }); addAnnotation (getDocumentRoot_MovieDB(), source, @@ -895,7 +895,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage "kind", "element", "name", "movieDB", "namespace", "##targetNamespace" - }); + }); addAnnotation (getDocumentRoot_SpecialFeatures(), source, @@ -904,14 +904,14 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage "kind", "element", "name", "specialFeatures", "namespace", "##targetNamespace" - }); + }); addAnnotation (genreTypesEEnum, source, new String[] { "name", "genreTypes" - }); + }); addAnnotation (genreTypesObjectEDataType, source, @@ -919,7 +919,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage { "name", "genreTypes:Object", "baseType", "genreTypes" - }); + }); addAnnotation (movieDBTypeEClass, source, @@ -927,7 +927,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage { "name", "movieDBType", "kind", "elementOnly" - }); + }); addAnnotation (getMovieDBType_MovieDBFeatureMap(), source, @@ -935,7 +935,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage { "name", ":group", "kind", "group" - }); + }); addAnnotation (getMovieDBType_Movie(), source, @@ -945,7 +945,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage "name", "movie", "namespace", "##targetNamespace", "group", "#:group" - }); + }); addAnnotation (getMovieDBType_Comment(), source, @@ -954,7 +954,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage "kind", "element", "name", "comment", "group", "#:group" - }); + }); addAnnotation (movieTypeEClass, source, @@ -962,7 +962,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage { "name", "movie", "kind", "elementOnly" - }); + }); addAnnotation (getMovieType_Title(), source, @@ -970,7 +970,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage { "kind", "element", "name", "title" - }); + }); addAnnotation (getMovieType_Actors(), source, @@ -978,7 +978,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage { "kind", "element", "name", "actors" - }); + }); addAnnotation (getMovieType_Director(), source, @@ -986,7 +986,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage { "kind", "element", "name", "director" - }); + }); addAnnotation (getMovieType_Genre(), source, @@ -994,7 +994,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage { "kind", "element", "name", "genre" - }); + }); addAnnotation (getMovieType_Summary(), source, @@ -1002,7 +1002,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage { "kind", "element", "name", "summary" - }); + }); addAnnotation (getMovieType_CriticsReviewGroup(), source, @@ -1011,7 +1011,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage "kind", "group", "name", "criticsReview:group", "namespace", "##targetNamespace" - }); + }); addAnnotation (getMovieType_CriticsReview(), source, @@ -1021,7 +1021,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage "name", "criticsReview", "namespace", "##targetNamespace", "group", "criticsReview:group" - }); + }); addAnnotation (getMovieType_CheckedOutBy(), source, @@ -1030,7 +1030,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage "kind", "element", "name", "checkedOutBy", "namespace", "##targetNamespace" - }); + }); addAnnotation (getMovieType_Any(), source, @@ -1040,7 +1040,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage "wildcards", "##any", "name", ":8", "processing", "strict" - }); + }); addAnnotation (getMovieType_ID(), source, @@ -1049,7 +1049,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage "kind", "attribute", "name", "ID", "namespace", "http:///org.eclipse.emf.test.models/Customer" - }); + }); addAnnotation (ratingTypeEDataType, source, @@ -1059,7 +1059,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage "baseType", "http://www.eclipse.org/emf/2003/XMLType#int", "minInclusive", "0", "maxInclusive", "10" - }); + }); addAnnotation (ratingTypeObjectEDataType, source, @@ -1067,7 +1067,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage { "name", "rating_._type:Object", "baseType", "rating_._type" - }); + }); addAnnotation (ratingValuesEDataType, source, @@ -1077,7 +1077,7 @@ public class DBPackageImpl extends EPackageImpl implements DBPackage "baseType", "http://www.eclipse.org/emf/2003/XMLType#int", "minInclusive", "0", "maxInclusive", "10" - }); + }); addAnnotation (ratingValuesObjectEDataType, source, diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/DocumentRootImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/DocumentRootImpl.java index 455d0f488..2cc87aa0a 100644 --- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/DocumentRootImpl.java +++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/DocumentRootImpl.java @@ -35,6 +35,7 @@ import org.eclipse.emf.test.models.movie.db.MovieDBType; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.emf.test.models.movie.db.impl.DocumentRootImpl#getMixed <em>Mixed</em>}</li> * <li>{@link org.eclipse.emf.test.models.movie.db.impl.DocumentRootImpl#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li> @@ -46,7 +47,6 @@ import org.eclipse.emf.test.models.movie.db.MovieDBType; * <li>{@link org.eclipse.emf.test.models.movie.db.impl.DocumentRootImpl#getMovieDB <em>Movie DB</em>}</li> * <li>{@link org.eclipse.emf.test.models.movie.db.impl.DocumentRootImpl#getSpecialFeatures <em>Special Features</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/MovieDBTypeImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/MovieDBTypeImpl.java index a7b752351..f4e1a87c8 100644 --- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/MovieDBTypeImpl.java +++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/MovieDBTypeImpl.java @@ -30,12 +30,12 @@ import org.eclipse.emf.test.models.movie.db.MovieType; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.emf.test.models.movie.db.impl.MovieDBTypeImpl#getMovieDBFeatureMap <em>Movie DB Feature Map</em>}</li> * <li>{@link org.eclipse.emf.test.models.movie.db.impl.MovieDBTypeImpl#getMovie <em>Movie</em>}</li> * <li>{@link org.eclipse.emf.test.models.movie.db.impl.MovieDBTypeImpl#getComment <em>Comment</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/MovieTypeImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/MovieTypeImpl.java index fc35bee27..5487607a1 100644 --- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/MovieTypeImpl.java +++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/MovieTypeImpl.java @@ -35,6 +35,7 @@ import org.eclipse.emf.test.models.movie.db.MovieType; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.emf.test.models.movie.db.impl.MovieTypeImpl#getTitle <em>Title</em>}</li> * <li>{@link org.eclipse.emf.test.models.movie.db.impl.MovieTypeImpl#getActors <em>Actors</em>}</li> @@ -47,7 +48,6 @@ import org.eclipse.emf.test.models.movie.db.MovieType; * <li>{@link org.eclipse.emf.test.models.movie.db.impl.MovieTypeImpl#getAny <em>Any</em>}</li> * <li>{@link org.eclipse.emf.test.models.movie.db.impl.MovieTypeImpl#getID <em>ID</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/util/DBSwitch.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/util/DBSwitch.java index edea773e7..47bf7f38d 100644 --- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/util/DBSwitch.java +++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/util/DBSwitch.java @@ -10,10 +10,9 @@ */ package org.eclipse.emf.test.models.movie.db.util; -import java.util.List; - -import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.util.Switch; import org.eclipse.emf.test.models.movie.db.CriticsReviewType; import org.eclipse.emf.test.models.movie.db.CustomerReviewType; import org.eclipse.emf.test.models.movie.db.DBPackage; @@ -34,7 +33,7 @@ import org.eclipse.emf.test.models.movie.db.MovieType; * @see org.eclipse.emf.test.models.movie.db.DBPackage * @generated */ -public class DBSwitch<T> +public class DBSwitch<T> extends Switch<T> { /** * The cached model package @@ -59,38 +58,17 @@ public class DBSwitch<T> } /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. + * Checks whether this is a switch for the given package. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the first non-null result returned by a <code>caseXXX</code> call. + * @param ePackage the package in question. + * @return whether this is a switch for the given package. * @generated */ - public T doSwitch(EObject theEObject) + @Override + protected boolean isSwitchFor(EPackage ePackage) { - 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 - */ - protected T doSwitch(EClass theEClass, EObject theEObject) - { - if (theEClass.eContainer() == modelPackage) - { - return doSwitch(theEClass.getClassifierID(), theEObject); - } - else - { - List<EClass> eSuperTypes = theEClass.getESuperTypes(); - return - eSuperTypes.isEmpty() ? - defaultCase(theEObject) : - doSwitch(eSuperTypes.get(0), theEObject); - } + return ePackage == modelPackage; } /** @@ -100,6 +78,7 @@ public class DBSwitch<T> * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ + @Override protected T doSwitch(int classifierID, EObject theEObject) { switch (classifierID) @@ -235,6 +214,7 @@ public class DBSwitch<T> * @see #doSwitch(org.eclipse.emf.ecore.EObject) * @generated */ + @Override public T defaultCase(EObject object) { return null; |