Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Merks2015-03-26 04:58:32 -0400
committerEd Merks2015-03-28 03:00:59 -0400
commit1437f0b2ce8651a0566aaed6caaa5e1012c7cb51 (patch)
treeef736db03c612f1a0f3a6c07927df39d50882909
parent5ce762d2b21c17b9ff4e9e7f8eae8cf038f3c9f8 (diff)
downloadorg.eclipse.emf-1437f0b2ce8651a0566aaed6caaa5e1012c7cb51.tar.gz
org.eclipse.emf-1437f0b2ce8651a0566aaed6caaa5e1012c7cb51.tar.xz
org.eclipse.emf-1437f0b2ce8651a0566aaed6caaa5e1012c7cb51.zip
[434699] Regenerate models
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.core.model/META-INF/MANIFEST.MF2
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.core.model/model/Project.genmodel11
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/CommitterShip.java2
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Foundation.java2
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Person.java2
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Project.java2
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/CommitterShipImpl.java4
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/FoundationImpl.java2
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/PersonImpl.java2
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/ProjectFactoryImpl.java2
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/ProjectImpl.java4
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/util/ProjectSwitch.java42
-rw-r--r--examples/org.eclipse.emf.examples.library.edit/META-INF/MANIFEST.MF4
-rw-r--r--examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/AudioVisualItemItemProvider.java13
-rw-r--r--examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BookItemProvider.java13
-rw-r--r--examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BookOnTapeItemProvider.java14
-rw-r--r--examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BorrowerItemProvider.java14
-rw-r--r--examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/CirculatingItemItemProvider.java13
-rw-r--r--examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/EmployeeItemProvider.java14
-rw-r--r--examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/PeriodicalItemProvider.java13
-rw-r--r--examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/VideoCassetteItemProvider.java14
-rw-r--r--examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/WriterItemProvider.java13
-rw-r--r--examples/org.eclipse.emf.examples.library.editor/META-INF/MANIFEST.MF4
-rw-r--r--examples/org.eclipse.emf.examples.library.editor/src/org/eclipse/emf/examples/extlibrary/presentation/EXTLibraryEditor.java105
-rw-r--r--examples/org.eclipse.emf.examples.library.editor/src/org/eclipse/emf/examples/extlibrary/presentation/EXTLibraryModelWizard.java5
-rw-r--r--examples/org.eclipse.emf.examples.library/META-INF/MANIFEST.MF4
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Addressable.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/AudioVisualItem.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Book.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/BookCategory.java6
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/BookOnTape.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Borrower.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Employee.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Item.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Lendable.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Library.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Periodical.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Person.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/VideoCassette.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Writer.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/AudioVisualItemImpl.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/BookImpl.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/BookOnTapeImpl.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/BorrowerImpl.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/CirculatingItemImpl.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/EXTLibraryFactoryImpl.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/EXTLibraryPackageImpl.java8
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/EmployeeImpl.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/ItemImpl.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/LibraryImpl.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/PeriodicalImpl.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/PersonImpl.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/VideoCassetteImpl.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/WriterImpl.java2
-rw-r--r--examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/util/EXTLibrarySwitch.java42
-rw-r--r--examples/org.eclipse.emf.java.edit/META-INF/MANIFEST.MF2
-rw-r--r--examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JClassItemProvider.java7
-rw-r--r--examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JCompilationUnitItemProvider.java7
-rw-r--r--examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JFieldItemProvider.java7
-rw-r--r--examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JInitializerItemProvider.java7
-rw-r--r--examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JMemberItemProvider.java7
-rw-r--r--examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JMethodItemProvider.java7
-rw-r--r--examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JPackageItemProvider.java7
-rw-r--r--examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JParameterItemProvider.java7
-rw-r--r--examples/org.eclipse.emf.java.editor/META-INF/MANIFEST.MF2
-rw-r--r--examples/org.eclipse.emf.java.editor/src/org/eclipse/emf/java/presentation/JavaEditor.java103
-rw-r--r--examples/org.eclipse.emf.java/META-INF/MANIFEST.MF2
-rw-r--r--examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JClass.java2
-rw-r--r--examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JCompilationUnit.java2
-rw-r--r--examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JField.java2
-rw-r--r--examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JInitializer.java2
-rw-r--r--examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JMember.java2
-rw-r--r--examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JMethod.java2
-rw-r--r--examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JModelElement.java2
-rw-r--r--examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JPackage.java2
-rw-r--r--examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JParameter.java2
-rw-r--r--examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JVisibility.java6
-rw-r--r--examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JClassImpl.java6
-rw-r--r--examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JCompilationUnitImpl.java2
-rw-r--r--examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JFieldImpl.java2
-rw-r--r--examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JInitializerImpl.java2
-rw-r--r--examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JMemberImpl.java4
-rw-r--r--examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JMethodImpl.java2
-rw-r--r--examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JModelElementImpl.java2
-rw-r--r--examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JPackageImpl.java2
-rw-r--r--examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JParameterImpl.java4
-rw-r--r--examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JavaFactoryImpl.java2
-rw-r--r--examples/org.eclipse.emf.java/src/org/eclipse/emf/java/util/JavaSwitch.java42
-rw-r--r--features/org.eclipse.emf.codegen-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.codegen.ecore.ui-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.common.ui-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.converter-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.mapping-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.mapping.ecore-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.mapping.ecore.editor-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.mapping.ui-feature/feature.xml2
-rwxr-xr-xfeatures/org.eclipse.emf.rap.common.ui-feature/feature.xml2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/GenModelEditor.java7
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenAnnotationItemProvider.java13
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenClassItemProvider.java7
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenDataTypeItemProvider.java8
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenEnumItemProvider.java7
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenEnumLiteralItemProvider.java8
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenFeatureItemProvider.java7
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenModelItemProvider.java7
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenOperationItemProvider.java8
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenPackageItemProvider.java7
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenAnnotation.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenBase.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenClass.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenClassifier.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenDataType.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenDecoration.java6
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenDelegationKind.java6
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenEnum.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenEnumLiteral.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenFeature.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenJDKLevel.java6
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenModel.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenOperation.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenPackage.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenParameter.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenPropertyKind.java6
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenProviderKind.java6
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenResourceKind.java6
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenRuntimePlatform.java6
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenRuntimeVersion.java6
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenTypeParameter.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenAnnotationImpl.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenBaseImpl.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenClassImpl.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenClassifierImpl.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenDataTypeImpl.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenEnumImpl.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenEnumLiteralImpl.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenFeatureImpl.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelImpl.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenOperationImpl.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenPackageImpl.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenParameterImpl.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenTypeParameterImpl.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenTypedElementImpl.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/util/GenModelSwitch.java2
-rw-r--r--plugins/org.eclipse.emf.codegen/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jet/JETEmitter.java3
-rw-r--r--plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/ast/ASTJField.java2
-rw-r--r--plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/ast/ASTJMethod.java8
-rw-r--r--plugins/org.eclipse.emf.common.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.common.ui/src/org/eclipse/emf/common/ui/URIEditorInput.java2
-rw-r--r--plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/SegmentSequence.java2
-rw-r--r--plugins/org.eclipse.emf.ecore.change/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/ChangeDescription.java2
-rw-r--r--plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/ChangeKind.java6
-rw-r--r--plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/FeatureChange.java2
-rw-r--r--plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/FeatureMapEntry.java2
-rw-r--r--plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/ListChange.java2
-rw-r--r--plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/ResourceChange.java2
-rw-r--r--plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/ChangeDescriptionImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/EObjectToChangesMapEntryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/FeatureChangeImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/FeatureMapEntryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/ListChangeImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/ResourceChangeImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/util/ChangeSwitch.java2
-rw-r--r--plugins/org.eclipse.emf.ecore.editor/src/org/eclipse/emf/ecore/presentation/EcoreEditor.java7
-rw-r--r--plugins/org.eclipse.emf.ecore.xcore.ui/src/org/eclipse/emf/ecore/xcore/ui/AbstractSelectionView.java3
-rw-r--r--plugins/org.eclipse.emf.ecore.xcore.ui/src/org/eclipse/emf/ecore/xcore/ui/contentassist/XcoreProposalProvider.java4
-rw-r--r--plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/util/XcoreEcoreBuilder.java1
-rw-r--r--plugins/org.eclipse.emf.ecore.xmi/src/org/eclipse/emf/ecore/xmi/impl/XMLResourceImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EAnnotation.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EAttribute.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EClass.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EClassifier.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EDataType.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EEnum.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EEnumLiteral.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EFactory.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EGenericType.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EModelElement.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/ENamedElement.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EOperation.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EPackage.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EParameter.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EReference.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EStructuralFeature.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/ETypeParameter.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/ETypedElement.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EAnnotationImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EAttributeImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EClassImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EClassifierImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EDataTypeImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EEnumImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EEnumLiteralImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EFactoryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/ENamedElementImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EOperationImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EPackageImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EParameterImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EReferenceImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EStructuralFeatureImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/ETypeParameterImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/ETypedElementImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/resource/impl/URIHandlerImpl.java3
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/EcoreSwitch.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/SpaceType.java6
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/XMLNamespaceDocumentRoot.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/impl/XMLNamespaceDocumentRootImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/impl/XMLNamespaceFactoryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/impl/XMLNamespacePackageImpl.java28
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/AnyType.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/ProcessingInstruction.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/SimpleAnyType.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/XMLTypeDocumentRoot.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/AnyTypeImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/ProcessingInstructionImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/SimpleAnyTypeImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/XMLTypeDocumentRootImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/XMLTypeFactoryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/XMLTypePackageImpl.java156
-rw-r--r--plugins/org.eclipse.emf.edit/src/org/eclipse/emf/edit/tree/TreeNode.java2
-rw-r--r--plugins/org.eclipse.emf.edit/src/org/eclipse/emf/edit/tree/impl/TreeNodeImpl.java2
-rw-r--r--plugins/org.eclipse.emf.edit/src/org/eclipse/emf/edit/tree/util/TreeSwitch.java2
-rw-r--r--plugins/org.eclipse.emf.importer.rose/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.importer.rose/src/org/eclipse/emf/importer/rose/parser/RoseParser.java6
-rw-r--r--plugins/org.eclipse.emf.mapping.ecore2ecore/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.mapping.ecore2ecore/src/org/eclipse/emf/mapping/ecore2ecore/impl/Ecore2EcoreMappingRootImpl.java2
-rw-r--r--plugins/org.eclipse.emf.mapping.ecore2ecore/src/org/eclipse/emf/mapping/ecore2ecore/util/Ecore2EcoreSwitch.java2
-rw-r--r--plugins/org.eclipse.emf.mapping.ecore2xml.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.mapping.ecore2xml.ui/src/org/eclipse/emf/mapping/ecore2xml/presentation/Ecore2XMLEditor.java7
-rw-r--r--plugins/org.eclipse.emf.mapping.ecore2xml/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/XMLInfo.java2
-rw-r--r--plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/XMLMap.java2
-rw-r--r--plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/impl/ENamedElementToXMLInfoMapEntryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/impl/XMLInfoImpl.java2
-rw-r--r--plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/impl/XMLMapImpl.java2
-rw-r--r--plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/util/Ecore2XMLSwitch.java2
-rw-r--r--plugins/org.eclipse.emf.mapping.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.mapping.ui/src/org/eclipse/emf/mapping/presentation/MappingEditor.java2
-rw-r--r--plugins/org.eclipse.emf.mapping/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/ComplexTypeConverter.java2
-rw-r--r--plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/FunctionNamePair.java2
-rw-r--r--plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/FunctionPair.java2
-rw-r--r--plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/Mapping.java2
-rw-r--r--plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/MappingHelper.java2
-rw-r--r--plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/MappingRoot.java2
-rw-r--r--plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/ComplexTypeConverterImpl.java2
-rw-r--r--plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/FunctionNamePairImpl.java2
-rw-r--r--plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/FunctionPairImpl.java2
-rw-r--r--plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/MappingHelperImpl.java2
-rw-r--r--plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/MappingImpl.java2
-rw-r--r--plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/MappingRootImpl.java2
-rw-r--r--plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/MappingStrategyImpl.java2
-rw-r--r--plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/TypeConverterImpl.java2
-rw-r--r--plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/util/MappingSwitch.java2
-rwxr-xr-xplugins/org.eclipse.emf.rap.common.ui/META-INF/MANIFEST.MF2
-rwxr-xr-xplugins/org.eclipse.emf.rap.common.ui/src/org/eclipse/emf/common/ui/URIEditorInput.java2
-rw-r--r--tests/org.eclipse.emf.test.common/models/Reification/Reification.genmodel5
-rw-r--r--tests/org.eclipse.emf.test.common/models/edit.RefTest/ref.ecore32
-rw-r--r--tests/org.eclipse.emf.test.common/plugin.xml210
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/Bidirectional.java3
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/BoundedGenericContainer.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/KeyValuePair.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/KeyValuePairContainer.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/MediumBidirectional.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/Root.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/UnboundedGenericContainer.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/BidirectionalImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/BoundedGenericContainerImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/BoundedTListKeyValuePairImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/ContainerImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/HighBoundedContainerImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/HighImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/HighListKeyValuePairImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/IntegerListKeyValuePairImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/KeyValuePairContainerImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/KeyValuePairImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/LinkImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/LinkItemImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/LowImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/MediumBidirectionalImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/MediumImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/MediumLinkImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/MediumUnboundedContainerImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/RawKeyValuePairImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/RawLinkImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/RawUnboundedContainerImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/ReificationFactoryImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/RootImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/StringListKeyValuePairContainerImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/StringListKeyValuePairImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/TListKeyValuePairImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/UnboundedGenericContainerImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/VeryHighImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/VeryLowImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/util/ReificationSwitch.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/AddressType.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/CanadaAddr.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/CreditInfo.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/CustomerType.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/CustomersType.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/DocumentRoot.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/USAddr.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/USState.java6
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/AddressTypeImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CanadaAddrImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CreditInfoImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CustomerFactoryImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CustomerPackageImpl.java64
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CustomerTypeImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CustomersTypeImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/DocumentRootImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/USAddrImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/util/CustomerSwitch.java42
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/DbType.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/DocumentRoot.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/impl/DBItemFactoryImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/impl/DBItemPackageImpl.java20
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/impl/DbTypeImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/impl/DocumentRootImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/util/DBItemSwitch.java42
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/PenType.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/PencilType.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/impl/DBPriceFactoryImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/impl/DBPricePackageImpl.java8
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/impl/PenTypeImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/impl/PencilTypeImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/util/DBPriceSwitch.java42
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/ExtE.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/F.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/impl/ExtEImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/impl/ExtFactoryImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/impl/FImpl.java4
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/provider/ExtEItemProvider.java13
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/util/ExtSwitch.java42
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/key/Item.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/key/Root.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/key/impl/ItemImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/key/impl/KeyFactoryImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/key/impl/RootImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/key/util/KeySwitch.java42
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/lib/Address.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/lib/Book.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/lib/Cafeteria.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/lib/Library.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/lib/Person.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/lib/impl/AddressImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/lib/impl/BookImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/lib/impl/CafeteriaImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/lib/impl/LibFactoryImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/lib/impl/LibraryImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/lib/impl/PersonImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/lib/util/LibSwitch.java42
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/library/Book.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/library/BookCategory.java6
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/library/Library.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/library/Writer.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/library/impl/BookImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/library/impl/LibraryFactoryImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/library/impl/LibraryImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/library/impl/LibraryPackageImpl.java21
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/library/impl/WriterImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/library/util/LibrarySwitch.java42
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/CriticsReviewType.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/CustomerReviewType.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/DocumentRoot.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/GenreTypes.java6
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/MovieDBType.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/MovieType.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/CriticsReviewTypeImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/CustomerReviewTypeImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/DBFactoryImpl.java7
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/DBPackageImpl.java74
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/DocumentRootImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/MovieDBTypeImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/MovieTypeImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/util/DBSwitch.java42
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/order/CustomerOrder.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/order/DocumentRoot.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/order/Order.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/order/impl/CustomerOrderImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/order/impl/DocumentRootImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/order/impl/OrderFactoryImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/order/impl/OrderImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/order/impl/OrderPackageImpl.java32
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/order/util/OrderSwitch.java42
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ppo/Item.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ppo/PurchaseOrder.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ppo/USAddress.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ppo/impl/ItemImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ppo/impl/PPOFactoryImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ppo/impl/PPOPackageImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ppo/impl/PurchaseOrderImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ppo/impl/USAddressImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ppo/util/PPOSwitch.java42
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ppo/util/PPOValidator.java4
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/qname/DocumentRoot.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/qname/ResourceType.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/qname/impl/DocumentRootImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/qname/impl/QNameFactoryImpl.java10
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/qname/impl/QNamePackageImpl.java42
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/qname/impl/ResourceTypeImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/qname/util/QNameSwitch.java42
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/A.java4
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/B.java4
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/C.java4
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/C1.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/C2.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/C3.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/C4.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/D.java4
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/E.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/impl/AImpl.java4
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/impl/BImpl.java4
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/impl/C1Impl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/impl/C2Impl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/impl/C3Impl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/impl/C4Impl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/impl/CImpl.java4
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/impl/DImpl.java4
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/impl/EImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/impl/RefFactoryImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/impl/RefPackageImpl.java8
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/unsettable/AU.java6
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/unsettable/BU.java4
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/unsettable/C1U.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/unsettable/C2U.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/unsettable/C3U.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/unsettable/C4U.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/unsettable/CU.java4
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/unsettable/DU.java4
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/unsettable/EU.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/unsettable/impl/AUImpl.java4
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/unsettable/impl/BUImpl.java4
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/unsettable/impl/C1UImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/unsettable/impl/C2UImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/unsettable/impl/C3UImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/unsettable/impl/C4UImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/unsettable/impl/CUImpl.java4
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/unsettable/impl/DUImpl.java4
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/unsettable/impl/EUImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/unsettable/impl/URefFactoryImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/unsettable/impl/URefPackageImpl.java10
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/unsettable/util/URefSwitch.java42
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/util/RefSwitch.java42
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/switch1/EClass0.java58
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/switch1/EClass1.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/switch1/impl/EClass0Impl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/switch1/impl/EClass1Impl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/switch1/impl/Switch1FactoryImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/switch2/EClass2.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/switch2/EClass3.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/switch2/impl/EClass2Impl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/switch2/impl/EClass3Impl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/switch2/impl/Switch2FactoryImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/switch3/EClass4.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/switch3/EClass5.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/switch3/impl/EClass4Impl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/switch3/impl/EClass5Impl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/switch3/impl/Switch3FactoryImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/tree/Data.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/tree/Node.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/tree/impl/DataImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/tree/impl/NodeImpl.java4
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/tree/impl/TreeFactoryImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/tree/util/TreeSwitch.java42
-rw-r--r--tests/org.eclipse.emf.test.core/META-INF/MANIFEST.MF4
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/change/SpecialCasesTest.java10
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/common/util/URITest.java5
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/extmetadata/Attribute.java2
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/extmetadata/Class.java2
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/extmetadata/NamedElement.java2
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/extmetadata/extmetadata.genmodel8
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/extmetadata/impl/AttributeImpl.java20
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/extmetadata/impl/ClassImpl.java20
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/extmetadata/impl/ExtmetadataFactoryImpl.java12
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/extmetadata/impl/ExtmetadataPackageImpl.java4
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/extmetadata/impl/NamedElementImpl.java14
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/extmetadata/util/ExtmetadataAdapterFactory.java24
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/extmetadata/util/ExtmetadataSwitch.java17
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/featuremap/supplier/PurchaseOrder.java2
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/featuremap/supplier/Supplier.java2
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/featuremap/supplier/impl/PurchaseOrderImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/featuremap/supplier/impl/SupplierFactoryImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/featuremap/supplier/impl/SupplierImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/featuremap/supplier/impl/SupplierPackageImpl.java60
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/featuremap/supplier/util/SupplierSwitch.java42
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/xrefsmodel/A.java2
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/xrefsmodel/impl/AImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/xrefsmodel/impl/XRefsModelPackageImpl.java4
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/xrefsmodel/util/XRefsModelSwitch.java2
-rw-r--r--tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/xrefsmodel/xrefsmodel.genmodel8
-rw-r--r--tests/org.eclipse.emf.test.databinding/model/EMFDB.genmodel18
-rw-r--r--tests/org.eclipse.emf.test.databinding/src/org/eclipse/emf/test/databinding/emfdb/A.java2
-rw-r--r--tests/org.eclipse.emf.test.databinding/src/org/eclipse/emf/test/databinding/emfdb/B.java2
-rw-r--r--tests/org.eclipse.emf.test.databinding/src/org/eclipse/emf/test/databinding/emfdb/D.java2
-rw-r--r--tests/org.eclipse.emf.test.databinding/src/org/eclipse/emf/test/databinding/emfdb/E.java2
-rw-r--r--tests/org.eclipse.emf.test.databinding/src/org/eclipse/emf/test/databinding/emfdb/impl/AImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.databinding/src/org/eclipse/emf/test/databinding/emfdb/impl/BImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.databinding/src/org/eclipse/emf/test/databinding/emfdb/impl/CImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.databinding/src/org/eclipse/emf/test/databinding/emfdb/impl/DImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.databinding/src/org/eclipse/emf/test/databinding/emfdb/impl/EImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.databinding/src/org/eclipse/emf/test/databinding/emfdb/impl/EmfdbFactoryImpl.java2
-rw-r--r--tests/org.eclipse.emf.test.databinding/src/org/eclipse/emf/test/databinding/emfdb/impl/EmfdbPackageImpl.java4
-rw-r--r--tests/org.eclipse.emf.test.databinding/src/org/eclipse/emf/test/databinding/emfdb/util/EmfdbSwitch.java2
506 files changed, 1475 insertions, 1786 deletions
diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.examples.databinding.project.core.model/META-INF/MANIFEST.MF
index 77f9d560c..c3480b097 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.core.model/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.examples.databinding.project.core.model;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/model/Project.genmodel b/examples/org.eclipse.emf.examples.databinding.project.core.model/model/Project.genmodel
index e980813cd..3c21b76a1 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.core.model/model/Project.genmodel
+++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/model/Project.genmodel
@@ -1,9 +1,9 @@
<?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"
+<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.examples.databinding.project.core.model/src"
- modelPluginID="org.eclipse.emf.examples.databinding.project.core.model" modelName="Project"
- importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false">
+ editDirectory="" editorDirectory="" modelPluginID="org.eclipse.emf.examples.databinding.project.core.model"
+ modelName="Project" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
+ complianceLevel="5.0" copyrightFields="false">
<foreignModel>Project.ecore</foreignModel>
<genPackages prefix="Project" basePackage="org.eclipse.emf.examples.databinding.project.core.model"
disposableProviderFactory="true" ecorePackage="Project.ecore#/">
@@ -20,6 +20,8 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Project.ecore#//Project/start"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Project.ecore#//Project/end"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Project.ecore#//Project/longname"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Project.ecore#//Project/devmail"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Project.ecore#//Project/homepage"/>
</genClasses>
<genClasses ecoreClass="Project.ecore#//CommitterShip">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Project.ecore#//CommitterShip/start"/>
@@ -32,6 +34,7 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Project.ecore#//Person/firstname"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Project.ecore#//Person/email"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Project.ecore#//Person/committerships"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Project.ecore#//Person/image"/>
</genClasses>
</genPackages>
</genmodel:GenModel>
diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/CommitterShip.java b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/CommitterShip.java
index f58ea7ec7..43685a68a 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/CommitterShip.java
+++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/CommitterShip.java
@@ -21,13 +21,13 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.CommitterShip#getStart <em>Start</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.CommitterShip#getEnd <em>End</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.CommitterShip#getProject <em>Project</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.CommitterShip#getPerson <em>Person</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.examples.databinding.project.core.model.project.ProjectPackage#getCommitterShip()
* @model
diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Foundation.java b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Foundation.java
index ef288c456..88c776d17 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Foundation.java
+++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Foundation.java
@@ -21,11 +21,11 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.Foundation#getProjects <em>Projects</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.Foundation#getPersons <em>Persons</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.examples.databinding.project.core.model.project.ProjectPackage#getFoundation()
* @model
diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Person.java b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Person.java
index 12bc1fdd1..ac3015aa8 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Person.java
+++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Person.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.Person#getLastname <em>Lastname</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.Person#getFirstname <em>Firstname</em>}</li>
@@ -28,7 +29,6 @@ import org.eclipse.emf.ecore.EObject;
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.Person#getCommitterships <em>Committerships</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.Person#getImage <em>Image</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.examples.databinding.project.core.model.project.ProjectPackage#getPerson()
* @model
diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Project.java b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Project.java
index d897f8d68..9c75f6004 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Project.java
+++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Project.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.Project#getShortname <em>Shortname</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.Project#getSubprojects <em>Subprojects</em>}</li>
@@ -35,7 +36,6 @@ import org.eclipse.emf.ecore.EObject;
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.Project#getDevmail <em>Devmail</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.Project#getHomepage <em>Homepage</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.examples.databinding.project.core.model.project.ProjectPackage#getProject()
* @model
diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/CommitterShipImpl.java b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/CommitterShipImpl.java
index d5e656ca1..44a8f6dba 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/CommitterShipImpl.java
+++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/CommitterShipImpl.java
@@ -35,13 +35,13 @@ import org.eclipse.emf.examples.databinding.project.core.model.project.ProjectPa
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.CommitterShipImpl#getStart <em>Start</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.CommitterShipImpl#getEnd <em>End</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.CommitterShipImpl#getProject <em>Project</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.CommitterShipImpl#getPerson <em>Person</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
@@ -172,7 +172,7 @@ public class CommitterShipImpl extends EObjectImpl implements CommitterShip
public Project getProject()
{
if (eContainerFeatureID() != ProjectPackage.COMMITTER_SHIP__PROJECT) return null;
- return (Project)eContainer();
+ return (Project)eInternalContainer();
}
/**
diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/FoundationImpl.java b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/FoundationImpl.java
index 34b4a143b..5ef8647e8 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/FoundationImpl.java
+++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/FoundationImpl.java
@@ -35,11 +35,11 @@ import org.eclipse.emf.examples.databinding.project.core.model.project.ProjectPa
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.FoundationImpl#getProjects <em>Projects</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.FoundationImpl#getPersons <em>Persons</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/PersonImpl.java b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/PersonImpl.java
index a84abe8b0..34d80167a 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/PersonImpl.java
+++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/PersonImpl.java
@@ -36,6 +36,7 @@ import org.eclipse.emf.examples.databinding.project.core.model.project.ProjectPa
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.PersonImpl#getLastname <em>Lastname</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.PersonImpl#getFirstname <em>Firstname</em>}</li>
@@ -43,7 +44,6 @@ import org.eclipse.emf.examples.databinding.project.core.model.project.ProjectPa
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.PersonImpl#getCommitterships <em>Committerships</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.PersonImpl#getImage <em>Image</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/ProjectFactoryImpl.java b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/ProjectFactoryImpl.java
index 6c2917ffe..bb6c449ca 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/ProjectFactoryImpl.java
+++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/ProjectFactoryImpl.java
@@ -39,7 +39,7 @@ public class ProjectFactoryImpl extends EFactoryImpl implements ProjectFactory
{
try
{
- ProjectFactory theProjectFactory = (ProjectFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/project/1.0.0");
+ ProjectFactory theProjectFactory = (ProjectFactory)EPackage.Registry.INSTANCE.getEFactory(ProjectPackage.eNS_URI);
if (theProjectFactory != null)
{
return theProjectFactory;
diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/ProjectImpl.java b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/ProjectImpl.java
index 289879566..1c7c907aa 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/ProjectImpl.java
+++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/ProjectImpl.java
@@ -41,6 +41,7 @@ import org.eclipse.emf.examples.databinding.project.core.model.project.ProjectPa
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.ProjectImpl#getShortname <em>Shortname</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.ProjectImpl#getSubprojects <em>Subprojects</em>}</li>
@@ -53,7 +54,6 @@ import org.eclipse.emf.examples.databinding.project.core.model.project.ProjectPa
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.ProjectImpl#getDevmail <em>Devmail</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.ProjectImpl#getHomepage <em>Homepage</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
@@ -289,7 +289,7 @@ public class ProjectImpl extends EObjectImpl implements Project
public Project getParent()
{
if (eContainerFeatureID() != ProjectPackage.PROJECT__PARENT) return null;
- return (Project)eContainer();
+ return (Project)eInternalContainer();
}
/**
diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/util/ProjectSwitch.java b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/util/ProjectSwitch.java
index 6466c876c..0b6496a95 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/util/ProjectSwitch.java
+++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/util/ProjectSwitch.java
@@ -10,11 +10,10 @@
*/
package org.eclipse.emf.examples.databinding.project.core.model.project.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.examples.databinding.project.core.model.project.*;
@@ -31,7 +30,7 @@ import org.eclipse.emf.examples.databinding.project.core.model.project.*;
* @see org.eclipse.emf.examples.databinding.project.core.model.project.ProjectPackage
* @generated
*/
-public class ProjectSwitch<T>
+public class ProjectSwitch<T> extends Switch<T>
{
/**
* The cached model package
@@ -56,38 +55,17 @@ public class ProjectSwitch<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;
}
/**
@@ -97,6 +75,7 @@ public class ProjectSwitch<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)
@@ -208,6 +187,7 @@ public class ProjectSwitch<T>
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
*/
+ @Override
public T defaultCase(EObject object)
{
return null;
diff --git a/examples/org.eclipse.emf.examples.library.edit/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.examples.library.edit/META-INF/MANIFEST.MF
index f5dbcc6dc..33751c0db 100644
--- a/examples/org.eclipse.emf.examples.library.edit/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.examples.library.edit/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.emf.examples.library.edit; singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-SymbolicName: org.eclipse.emf.examples.library.edit;singleton:=true
+Bundle-Version: 2.6.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.examples.extlibrary.provider.EXTLibraryEditPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/AudioVisualItemItemProvider.java b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/AudioVisualItemItemProvider.java
index e31420af3..d02d59579 100644
--- a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/AudioVisualItemItemProvider.java
+++ b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/AudioVisualItemItemProvider.java
@@ -18,12 +18,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
@@ -37,13 +32,7 @@ import org.eclipse.emf.examples.extlibrary.EXTLibraryPackage;
* @generated
*/
public class AudioVisualItemItemProvider
- extends CirculatingItemItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
+ extends CirculatingItemItemProvider
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BookItemProvider.java b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BookItemProvider.java
index e5962f3e6..2e5fc3e55 100644
--- a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BookItemProvider.java
+++ b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BookItemProvider.java
@@ -18,12 +18,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
@@ -37,13 +32,7 @@ import org.eclipse.emf.examples.extlibrary.EXTLibraryPackage;
* @generated
*/
public class BookItemProvider
- extends CirculatingItemItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
+ extends CirculatingItemItemProvider
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BookOnTapeItemProvider.java b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BookOnTapeItemProvider.java
index 2f4a2824d..48dce303d 100644
--- a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BookOnTapeItemProvider.java
+++ b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BookOnTapeItemProvider.java
@@ -18,13 +18,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
import org.eclipse.emf.examples.extlibrary.BookOnTape;
import org.eclipse.emf.examples.extlibrary.EXTLibraryPackage;
@@ -35,13 +29,7 @@ import org.eclipse.emf.examples.extlibrary.EXTLibraryPackage;
* @generated
*/
public class BookOnTapeItemProvider
- extends AudioVisualItemItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
+ extends AudioVisualItemItemProvider
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BorrowerItemProvider.java b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BorrowerItemProvider.java
index 4eaad6e79..d48672141 100644
--- a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BorrowerItemProvider.java
+++ b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BorrowerItemProvider.java
@@ -18,13 +18,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
import org.eclipse.emf.examples.extlibrary.Borrower;
import org.eclipse.emf.examples.extlibrary.EXTLibraryPackage;
@@ -35,13 +29,7 @@ import org.eclipse.emf.examples.extlibrary.EXTLibraryPackage;
* @generated
*/
public class BorrowerItemProvider
- extends PersonItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
+ extends PersonItemProvider
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/CirculatingItemItemProvider.java b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/CirculatingItemItemProvider.java
index d607ac702..c1c92e1fc 100644
--- a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/CirculatingItemItemProvider.java
+++ b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/CirculatingItemItemProvider.java
@@ -19,12 +19,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
@@ -38,13 +33,7 @@ import org.eclipse.emf.examples.extlibrary.EXTLibraryPackage;
* @generated
*/
public class CirculatingItemItemProvider
- extends ItemItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
+ extends ItemItemProvider
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/EmployeeItemProvider.java b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/EmployeeItemProvider.java
index 5c4e17a7b..1a3970182 100644
--- a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/EmployeeItemProvider.java
+++ b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/EmployeeItemProvider.java
@@ -18,13 +18,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
import org.eclipse.emf.examples.extlibrary.EXTLibraryPackage;
import org.eclipse.emf.examples.extlibrary.Employee;
@@ -35,13 +29,7 @@ import org.eclipse.emf.examples.extlibrary.Employee;
* @generated
*/
public class EmployeeItemProvider
- extends PersonItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
+ extends PersonItemProvider
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/PeriodicalItemProvider.java b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/PeriodicalItemProvider.java
index 065b27e46..88aaa3a07 100644
--- a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/PeriodicalItemProvider.java
+++ b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/PeriodicalItemProvider.java
@@ -18,12 +18,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
@@ -37,13 +32,7 @@ import org.eclipse.emf.examples.extlibrary.Periodical;
* @generated
*/
public class PeriodicalItemProvider
- extends ItemItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
+ extends ItemItemProvider
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/VideoCassetteItemProvider.java b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/VideoCassetteItemProvider.java
index f58af887f..dd4579b3f 100644
--- a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/VideoCassetteItemProvider.java
+++ b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/VideoCassetteItemProvider.java
@@ -18,13 +18,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
import org.eclipse.emf.examples.extlibrary.EXTLibraryPackage;
import org.eclipse.emf.examples.extlibrary.VideoCassette;
@@ -35,13 +29,7 @@ import org.eclipse.emf.examples.extlibrary.VideoCassette;
* @generated
*/
public class VideoCassetteItemProvider
- extends AudioVisualItemItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
+ extends AudioVisualItemItemProvider
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/WriterItemProvider.java b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/WriterItemProvider.java
index 1de4e032c..a23425e64 100644
--- a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/WriterItemProvider.java
+++ b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/WriterItemProvider.java
@@ -18,12 +18,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
@@ -37,13 +32,7 @@ import org.eclipse.emf.examples.extlibrary.Writer;
* @generated
*/
public class WriterItemProvider
- extends PersonItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
+ extends PersonItemProvider
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/examples/org.eclipse.emf.examples.library.editor/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.examples.library.editor/META-INF/MANIFEST.MF
index 65d21cccc..e1b9cf593 100644
--- a/examples/org.eclipse.emf.examples.library.editor/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.examples.library.editor/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.emf.examples.library.editor; singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-SymbolicName: org.eclipse.emf.examples.library.editor;singleton:=true
+Bundle-Version: 2.6.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.examples.extlibrary.presentation.EXTLibraryEditorPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/examples/org.eclipse.emf.examples.library.editor/src/org/eclipse/emf/examples/extlibrary/presentation/EXTLibraryEditor.java b/examples/org.eclipse.emf.examples.library.editor/src/org/eclipse/emf/examples/extlibrary/presentation/EXTLibraryEditor.java
index 699fcc29c..eda905653 100644
--- a/examples/org.eclipse.emf.examples.library.editor/src/org/eclipse/emf/examples/extlibrary/presentation/EXTLibraryEditor.java
+++ b/examples/org.eclipse.emf.examples.library.editor/src/org/eclipse/emf/examples/extlibrary/presentation/EXTLibraryEditor.java
@@ -58,9 +58,6 @@ import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
import org.eclipse.emf.edit.ui.util.EditUIUtil;
import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EValidator;
-
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
@@ -104,6 +101,7 @@ import org.eclipse.jface.action.Separator;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.jface.viewers.ColumnWeightData;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -123,6 +121,7 @@ import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.FileTransfer;
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.events.ControlAdapter;
@@ -232,7 +231,7 @@ public class EXTLibraryEditor extends MultiPageEditorPart
* <!-- end-user-doc -->
* @generated
*/
- protected PropertySheetPage propertySheetPage;
+ protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
/**
* This is the viewer that shadows the selection in the content outline.
@@ -356,7 +355,7 @@ public class EXTLibraryEditor extends MultiPageEditorPart
}
else if (p instanceof PropertySheet)
{
- if (((PropertySheet)p).getCurrentPage() == propertySheetPage)
+ if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage()))
{
getActionBarContributor().setActiveEditor(EXTLibraryEditor.this);
handleActivate();
@@ -481,6 +480,18 @@ public class EXTLibraryEditor extends MultiPageEditorPart
protected void unsetTarget(Resource target)
{
basicUnsetTarget(target);
+ resourceToDiagnosticMap.remove(target);
+ if (updateProblemIndication)
+ {
+ getSite().getShell().getDisplay().asyncExec
+ (new Runnable()
+ {
+ public void run()
+ {
+ updateProblemIndication();
+ }
+ });
+ }
}
};
@@ -524,6 +535,7 @@ public class EXTLibraryEditor extends MultiPageEditorPart
}
}
}
+ return false;
}
return true;
@@ -801,9 +813,17 @@ public class EXTLibraryEditor extends MultiPageEditorPart
{
setSelectionToViewer(mostRecentCommand.getAffectedObjects());
}
- if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed())
+ for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); )
{
- propertySheetPage.refresh();
+ PropertySheetPage propertySheetPage = i.next();
+ if (propertySheetPage.getControl().isDisposed())
+ {
+ i.remove();
+ }
+ else
+ {
+ propertySheetPage.refresh();
+ }
}
}
});
@@ -1034,7 +1054,7 @@ public class EXTLibraryEditor extends MultiPageEditorPart
getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
- Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance() };
+ Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
}
@@ -1079,11 +1099,12 @@ public class EXTLibraryEditor extends MultiPageEditorPart
*/
public Diagnostic analyzeResourceProblems(Resource resource, Exception exception)
{
- if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty())
+ boolean hasErrors = !resource.getErrors().isEmpty();
+ if (hasErrors || !resource.getWarnings().isEmpty())
{
BasicDiagnostic basicDiagnostic =
new BasicDiagnostic
- (Diagnostic.ERROR,
+ (hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
"org.eclipse.emf.examples.library.editor", //$NON-NLS-1$
0,
getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
@@ -1447,7 +1468,7 @@ public class EXTLibraryEditor extends MultiPageEditorPart
* <!-- end-user-doc -->
* @generated
*/
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public Object getAdapter(Class key)
{
@@ -1550,27 +1571,25 @@ public class EXTLibraryEditor extends MultiPageEditorPart
*/
public IPropertySheetPage getPropertySheetPage()
{
- if (propertySheetPage == null)
- {
- propertySheetPage =
- new ExtendedPropertySheetPage(editingDomain)
+ PropertySheetPage propertySheetPage =
+ new ExtendedPropertySheetPage(editingDomain)
+ {
+ @Override
+ public void setSelectionToViewer(List<?> selection)
{
- @Override
- public void setSelectionToViewer(List<?> selection)
- {
- EXTLibraryEditor.this.setSelectionToViewer(selection);
- EXTLibraryEditor.this.setFocus();
- }
+ EXTLibraryEditor.this.setSelectionToViewer(selection);
+ EXTLibraryEditor.this.setFocus();
+ }
- @Override
- public void setActionBars(IActionBars actionBars)
- {
- super.setActionBars(actionBars);
- getActionBarContributor().shareGlobalActions(this, actionBars);
- }
- };
- propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
- }
+ @Override
+ public void setActionBars(IActionBars actionBars)
+ {
+ super.setActionBars(actionBars);
+ getActionBarContributor().shareGlobalActions(this, actionBars);
+ }
+ };
+ propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+ propertySheetPages.add(propertySheetPage);
return propertySheetPage;
}
@@ -1646,6 +1665,7 @@ public class EXTLibraryEditor extends MultiPageEditorPart
//
final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+ saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
// Do the work within an operation because this is a long running activity that modifies the workbench.
//
@@ -1707,7 +1727,7 @@ public class EXTLibraryEditor extends MultiPageEditorPart
/**
* This returns whether something has been persisted to the URI of the specified resource.
- * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
+ * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -1789,25 +1809,10 @@ public class EXTLibraryEditor extends MultiPageEditorPart
*/
public void gotoMarker(IMarker marker)
{
- try
+ List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
+ if (!targetObjects.isEmpty())
{
- if (marker.getType().equals(EValidator.MARKER))
- {
- String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);
- if (uriAttribute != null)
- {
- URI uri = URI.createURI(uriAttribute);
- EObject eObject = editingDomain.getResourceSet().getEObject(uri, true);
- if (eObject != null)
- {
- setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));
- }
- }
- }
- }
- catch (CoreException exception)
- {
- EXTLibraryEditorPlugin.INSTANCE.log(exception);
+ setSelectionToViewer(targetObjects);
}
}
@@ -2023,7 +2028,7 @@ public class EXTLibraryEditor extends MultiPageEditorPart
getActionBarContributor().setActiveEditor(null);
}
- if (propertySheetPage != null)
+ for (PropertySheetPage propertySheetPage : propertySheetPages)
{
propertySheetPage.dispose();
}
diff --git a/examples/org.eclipse.emf.examples.library.editor/src/org/eclipse/emf/examples/extlibrary/presentation/EXTLibraryModelWizard.java b/examples/org.eclipse.emf.examples.library.editor/src/org/eclipse/emf/examples/extlibrary/presentation/EXTLibraryModelWizard.java
index b44060412..4fe98d448 100644
--- a/examples/org.eclipse.emf.examples.library.editor/src/org/eclipse/emf/examples/extlibrary/presentation/EXTLibraryModelWizard.java
+++ b/examples/org.eclipse.emf.examples.library.editor/src/org/eclipse/emf/examples/extlibrary/presentation/EXTLibraryModelWizard.java
@@ -83,6 +83,7 @@ import org.eclipse.emf.examples.extlibrary.provider.EXTLibraryEditPlugin;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.StructuredSelection;
@@ -318,7 +319,9 @@ public class EXTLibraryModelWizard extends Wizard implements INewWizard
{
page.openEditor
(new FileEditorInput(modelFile),
- workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
+ workbench.getEditorRegistry().getDefaultEditor
+ (modelFile.getFullPath().toString(),
+ Platform.getContentTypeManager().getContentType(EXTLibraryPackage.eCONTENT_TYPE)).getId());
}
catch (PartInitException exception)
{
diff --git a/examples/org.eclipse.emf.examples.library/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.examples.library/META-INF/MANIFEST.MF
index c803bbedb..decbdf5f4 100644
--- a/examples/org.eclipse.emf.examples.library/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.examples.library/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.emf.examples.library; singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-SymbolicName: org.eclipse.emf.examples.library;singleton:=true
+Bundle-Version: 2.6.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Addressable.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Addressable.java
index 527f8488d..a7f717bd4 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Addressable.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Addressable.java
@@ -21,10 +21,10 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.Addressable#getAddress <em>Address</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.examples.extlibrary.EXTLibraryPackage#getAddressable()
* @model interface="true" abstract="true"
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/AudioVisualItem.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/AudioVisualItem.java
index 171ce1e04..628aed8ea 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/AudioVisualItem.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/AudioVisualItem.java
@@ -18,12 +18,12 @@ package org.eclipse.emf.examples.extlibrary;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.AudioVisualItem#getTitle <em>Title</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.AudioVisualItem#getMinutesLength <em>Minutes Length</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.AudioVisualItem#isDamaged <em>Damaged</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.examples.extlibrary.EXTLibraryPackage#getAudioVisualItem()
* @model abstract="true"
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Book.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Book.java
index efb51d494..7e9fedd20 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Book.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Book.java
@@ -18,13 +18,13 @@ package org.eclipse.emf.examples.extlibrary;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.Book#getTitle <em>Title</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.Book#getPages <em>Pages</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.Book#getCategory <em>Category</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.Book#getAuthor <em>Author</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.examples.extlibrary.EXTLibraryPackage#getBook()
* @model
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/BookCategory.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/BookCategory.java
index 239e3fdaa..53c323c1a 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/BookCategory.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/BookCategory.java
@@ -115,6 +115,8 @@ public enum BookCategory implements Enumerator
* Returns the '<em><b>Book Category</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 BookCategory get(String literal)
@@ -134,6 +136,8 @@ public enum BookCategory implements Enumerator
* Returns the '<em><b>Book Category</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 BookCategory getByName(String name)
@@ -153,6 +157,8 @@ public enum BookCategory implements Enumerator
* Returns the '<em><b>Book Category</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 BookCategory get(int value)
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/BookOnTape.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/BookOnTape.java
index 1e7540953..e03763fe2 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/BookOnTape.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/BookOnTape.java
@@ -18,11 +18,11 @@ package org.eclipse.emf.examples.extlibrary;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.BookOnTape#getReader <em>Reader</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.BookOnTape#getAuthor <em>Author</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.examples.extlibrary.EXTLibraryPackage#getBookOnTape()
* @model
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Borrower.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Borrower.java
index 6d1d9a1fd..205fddf22 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Borrower.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Borrower.java
@@ -21,10 +21,10 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.Borrower#getBorrowed <em>Borrowed</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.examples.extlibrary.EXTLibraryPackage#getBorrower()
* @model
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Employee.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Employee.java
index 1ef809fae..39b72ca1e 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Employee.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Employee.java
@@ -18,10 +18,10 @@ package org.eclipse.emf.examples.extlibrary;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.Employee#getManager <em>Manager</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.examples.extlibrary.EXTLibraryPackage#getEmployee()
* @model
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Item.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Item.java
index d5e67e9f1..e66e65851 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Item.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Item.java
@@ -23,10 +23,10 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.Item#getPublicationDate <em>Publication Date</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.examples.extlibrary.EXTLibraryPackage#getItem()
* @model abstract="true"
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Lendable.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Lendable.java
index 95a43a08a..55afbbc23 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Lendable.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Lendable.java
@@ -23,11 +23,11 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.Lendable#getCopies <em>Copies</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.Lendable#getBorrowers <em>Borrowers</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.examples.extlibrary.EXTLibraryPackage#getLendable()
* @model interface="true" abstract="true"
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Library.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Library.java
index 380f36740..26510e98d 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Library.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Library.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.util.FeatureMap;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.Library#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.Library#getWriters <em>Writers</em>}</li>
@@ -34,7 +35,6 @@ import org.eclipse.emf.ecore.util.FeatureMap;
* <li>{@link org.eclipse.emf.examples.extlibrary.Library#getParentBranch <em>Parent Branch</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.Library#getPeople <em>People</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.examples.extlibrary.EXTLibraryPackage#getLibrary()
* @model
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Periodical.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Periodical.java
index 468292e31..01fce114f 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Periodical.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Periodical.java
@@ -18,11 +18,11 @@ package org.eclipse.emf.examples.extlibrary;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.Periodical#getTitle <em>Title</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.Periodical#getIssuesPerYear <em>Issues Per Year</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.examples.extlibrary.EXTLibraryPackage#getPeriodical()
* @model abstract="true"
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Person.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Person.java
index 71b910a47..3bf646fac 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Person.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Person.java
@@ -18,11 +18,11 @@ package org.eclipse.emf.examples.extlibrary;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.Person#getFirstName <em>First Name</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.Person#getLastName <em>Last Name</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.examples.extlibrary.EXTLibraryPackage#getPerson()
* @model
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/VideoCassette.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/VideoCassette.java
index 9dcb8fb03..b52fad46b 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/VideoCassette.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/VideoCassette.java
@@ -21,10 +21,10 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.VideoCassette#getCast <em>Cast</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.examples.extlibrary.EXTLibraryPackage#getVideoCassette()
* @model
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Writer.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Writer.java
index 39851705f..a1c8efded 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Writer.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Writer.java
@@ -21,11 +21,11 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.Writer#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.Writer#getBooks <em>Books</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.examples.extlibrary.EXTLibraryPackage#getWriter()
* @model
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/AudioVisualItemImpl.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/AudioVisualItemImpl.java
index 825ab0b9c..09939bb09 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/AudioVisualItemImpl.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/AudioVisualItemImpl.java
@@ -26,12 +26,12 @@ import org.eclipse.emf.examples.extlibrary.EXTLibraryPackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.AudioVisualItemImpl#getTitle <em>Title</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.AudioVisualItemImpl#getMinutesLength <em>Minutes Length</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.AudioVisualItemImpl#isDamaged <em>Damaged</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/BookImpl.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/BookImpl.java
index c6942dd6c..96b814b97 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/BookImpl.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/BookImpl.java
@@ -31,13 +31,13 @@ import org.eclipse.emf.examples.extlibrary.Writer;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.BookImpl#getTitle <em>Title</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.BookImpl#getPages <em>Pages</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.BookImpl#getCategory <em>Category</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.BookImpl#getAuthor <em>Author</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/BookOnTapeImpl.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/BookOnTapeImpl.java
index 2d15212f4..6f130dd1b 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/BookOnTapeImpl.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/BookOnTapeImpl.java
@@ -30,11 +30,11 @@ import org.eclipse.emf.examples.extlibrary.Writer;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.BookOnTapeImpl#getReader <em>Reader</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.BookOnTapeImpl#getAuthor <em>Author</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/BorrowerImpl.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/BorrowerImpl.java
index 1fa94b5f6..544de0f7e 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/BorrowerImpl.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/BorrowerImpl.java
@@ -34,10 +34,10 @@ import org.eclipse.emf.examples.extlibrary.Lendable;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.BorrowerImpl#getBorrowed <em>Borrowed</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/CirculatingItemImpl.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/CirculatingItemImpl.java
index 5e8543331..f0d9f72aa 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/CirculatingItemImpl.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/CirculatingItemImpl.java
@@ -37,11 +37,11 @@ import org.eclipse.emf.examples.extlibrary.Lendable;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.CirculatingItemImpl#getCopies <em>Copies</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.CirculatingItemImpl#getBorrowers <em>Borrowers</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/EXTLibraryFactoryImpl.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/EXTLibraryFactoryImpl.java
index af37b7fee..00c2d9d39 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/EXTLibraryFactoryImpl.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/EXTLibraryFactoryImpl.java
@@ -42,7 +42,7 @@ public class EXTLibraryFactoryImpl extends EFactoryImpl implements EXTLibraryFac
{
try
{
- EXTLibraryFactory theEXTLibraryFactory = (EXTLibraryFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org/eclipse/emf/examples/library/extlibrary.ecore/1.0.0"); //$NON-NLS-1$
+ EXTLibraryFactory theEXTLibraryFactory = (EXTLibraryFactory)EPackage.Registry.INSTANCE.getEFactory(EXTLibraryPackage.eNS_URI);
if (theEXTLibraryFactory != null)
{
return theEXTLibraryFactory;
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/EXTLibraryPackageImpl.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/EXTLibraryPackageImpl.java
index 714ea3030..068ea425c 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/EXTLibraryPackageImpl.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/EXTLibraryPackageImpl.java
@@ -891,28 +891,28 @@ public class EXTLibraryPackageImpl extends EPackageImpl implements EXTLibraryPac
*/
protected void createExtendedMetaDataAnnotations()
{
- String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$
+ String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$
addAnnotation
(getLibrary_Writers(),
source,
new String[]
{
"group", "#people" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ });
addAnnotation
(getLibrary_Employees(),
source,
new String[]
{
"group", "#people" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ });
addAnnotation
(getLibrary_Borrowers(),
source,
new String[]
{
"group", "#people" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ });
addAnnotation
(getLibrary_People(),
source,
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/EmployeeImpl.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/EmployeeImpl.java
index fc1622439..85d7cb99f 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/EmployeeImpl.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/EmployeeImpl.java
@@ -28,10 +28,10 @@ import org.eclipse.emf.examples.extlibrary.Employee;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.EmployeeImpl#getManager <em>Manager</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/ItemImpl.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/ItemImpl.java
index b50e79a0a..4b4d61287 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/ItemImpl.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/ItemImpl.java
@@ -29,10 +29,10 @@ import org.eclipse.emf.examples.extlibrary.Item;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.ItemImpl#getPublicationDate <em>Publication Date</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/LibraryImpl.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/LibraryImpl.java
index 954cd7d93..473c055da 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/LibraryImpl.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/LibraryImpl.java
@@ -44,6 +44,7 @@ import org.eclipse.emf.examples.extlibrary.Writer;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.LibraryImpl#getAddress <em>Address</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.LibraryImpl#getName <em>Name</em>}</li>
@@ -56,7 +57,6 @@ import org.eclipse.emf.examples.extlibrary.Writer;
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.LibraryImpl#getParentBranch <em>Parent Branch</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.LibraryImpl#getPeople <em>People</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/PeriodicalImpl.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/PeriodicalImpl.java
index efe19bddd..f825ece73 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/PeriodicalImpl.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/PeriodicalImpl.java
@@ -26,11 +26,11 @@ import org.eclipse.emf.examples.extlibrary.Periodical;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.PeriodicalImpl#getTitle <em>Title</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.PeriodicalImpl#getIssuesPerYear <em>Issues Per Year</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/PersonImpl.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/PersonImpl.java
index c8f29257e..bd26dc802 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/PersonImpl.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/PersonImpl.java
@@ -27,12 +27,12 @@ import org.eclipse.emf.examples.extlibrary.Person;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.PersonImpl#getAddress <em>Address</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.PersonImpl#getFirstName <em>First Name</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.PersonImpl#getLastName <em>Last Name</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/VideoCassetteImpl.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/VideoCassetteImpl.java
index e5f9df9a2..4f6b87987 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/VideoCassetteImpl.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/VideoCassetteImpl.java
@@ -28,10 +28,10 @@ import org.eclipse.emf.examples.extlibrary.VideoCassette;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.VideoCassetteImpl#getCast <em>Cast</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/WriterImpl.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/WriterImpl.java
index fc21663b3..47c97f4d6 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/WriterImpl.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/WriterImpl.java
@@ -34,11 +34,11 @@ import org.eclipse.emf.examples.extlibrary.Writer;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.WriterImpl#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.examples.extlibrary.impl.WriterImpl#getBooks <em>Books</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/util/EXTLibrarySwitch.java b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/util/EXTLibrarySwitch.java
index c26e16396..386564733 100644
--- a/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/util/EXTLibrarySwitch.java
+++ b/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/util/EXTLibrarySwitch.java
@@ -11,11 +11,10 @@
package org.eclipse.emf.examples.extlibrary.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.examples.extlibrary.*;
@@ -32,7 +31,7 @@ import org.eclipse.emf.examples.extlibrary.*;
* @see org.eclipse.emf.examples.extlibrary.EXTLibraryPackage
* @generated
*/
-public class EXTLibrarySwitch<T> {
+public class EXTLibrarySwitch<T> extends Switch<T> {
/**
* The cached model package
* <!-- begin-user-doc -->
@@ -56,38 +55,17 @@ public class EXTLibrarySwitch<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;
}
/**
@@ -97,6 +75,7 @@ public class EXTLibrarySwitch<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)
@@ -463,6 +442,7 @@ public class EXTLibrarySwitch<T> {
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
*/
+ @Override
public T defaultCase(EObject object)
{
return null;
diff --git a/examples/org.eclipse.emf.java.edit/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.java.edit/META-INF/MANIFEST.MF
index 3f888b60e..0720db77a 100644
--- a/examples/org.eclipse.emf.java.edit/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.java.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.java.edit;singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.java.provider.JavaEditPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JClassItemProvider.java b/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JClassItemProvider.java
index 61cd94296..bdca21f1e 100644
--- a/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JClassItemProvider.java
+++ b/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JClassItemProvider.java
@@ -19,12 +19,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.emf.java.JClass;
@@ -39,8 +34,6 @@ import org.eclipse.emf.java.JavaPackage;
*/
public class JClassItemProvider
extends JMemberItemProvider
- implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JCompilationUnitItemProvider.java b/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JCompilationUnitItemProvider.java
index 9a46fc3e8..5557923d2 100644
--- a/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JCompilationUnitItemProvider.java
+++ b/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JCompilationUnitItemProvider.java
@@ -18,12 +18,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.emf.java.JCompilationUnit;
@@ -38,8 +33,6 @@ import org.eclipse.emf.java.JavaPackage;
*/
public class JCompilationUnitItemProvider
extends JModelElementItemProvider
- implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JFieldItemProvider.java b/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JFieldItemProvider.java
index 646d0780e..203fa112b 100644
--- a/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JFieldItemProvider.java
+++ b/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JFieldItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.emf.java.JField;
@@ -36,8 +31,6 @@ import org.eclipse.emf.java.JavaPackage;
*/
public class JFieldItemProvider
extends JMemberItemProvider
- implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JInitializerItemProvider.java b/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JInitializerItemProvider.java
index 75b9d8fcb..68cf19ee1 100644
--- a/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JInitializerItemProvider.java
+++ b/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JInitializerItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.emf.java.JInitializer;
@@ -36,8 +31,6 @@ import org.eclipse.emf.java.JavaPackage;
*/
public class JInitializerItemProvider
extends JMemberItemProvider
- implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JMemberItemProvider.java b/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JMemberItemProvider.java
index ab769cedc..448efd687 100644
--- a/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JMemberItemProvider.java
+++ b/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JMemberItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.emf.java.JMember;
@@ -36,8 +31,6 @@ import org.eclipse.emf.java.JavaPackage;
*/
public class JMemberItemProvider
extends JModelElementItemProvider
- implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JMethodItemProvider.java b/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JMethodItemProvider.java
index 94efc3373..a625b445d 100644
--- a/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JMethodItemProvider.java
+++ b/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JMethodItemProvider.java
@@ -19,12 +19,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.emf.java.JMethod;
@@ -40,8 +35,6 @@ import org.eclipse.emf.java.JavaPackage;
*/
public class JMethodItemProvider
extends JMemberItemProvider
- implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JPackageItemProvider.java b/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JPackageItemProvider.java
index fd41e27ee..633afa0a1 100644
--- a/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JPackageItemProvider.java
+++ b/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JPackageItemProvider.java
@@ -18,12 +18,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.emf.java.JPackage;
@@ -38,8 +33,6 @@ import org.eclipse.emf.java.JavaPackage;
*/
public class JPackageItemProvider
extends JModelElementItemProvider
- implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JParameterItemProvider.java b/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JParameterItemProvider.java
index d253fdab7..b5b1862c0 100644
--- a/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JParameterItemProvider.java
+++ b/examples/org.eclipse.emf.java.edit/src/org/eclipse/emf/java/provider/JParameterItemProvider.java
@@ -16,12 +16,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.emf.java.JParameter;
@@ -36,8 +31,6 @@ import org.eclipse.emf.java.JavaPackage;
*/
public class JParameterItemProvider
extends JModelElementItemProvider
- implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/examples/org.eclipse.emf.java.editor/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.java.editor/META-INF/MANIFEST.MF
index 0ad662cae..c704f4937 100644
--- a/examples/org.eclipse.emf.java.editor/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.java.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.java.editor; singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.java.presentation.JavaEditorPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/examples/org.eclipse.emf.java.editor/src/org/eclipse/emf/java/presentation/JavaEditor.java b/examples/org.eclipse.emf.java.editor/src/org/eclipse/emf/java/presentation/JavaEditor.java
index cd645202a..a67c6c358 100644
--- a/examples/org.eclipse.emf.java.editor/src/org/eclipse/emf/java/presentation/JavaEditor.java
+++ b/examples/org.eclipse.emf.java.editor/src/org/eclipse/emf/java/presentation/JavaEditor.java
@@ -54,6 +54,7 @@ import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.jface.viewers.ColumnWeightData;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -70,6 +71,7 @@ import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.FileTransfer;
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.FillLayout;
@@ -119,7 +121,6 @@ import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.common.util.UniqueEList;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EValidator;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.util.EContentAdapter;
@@ -212,7 +213,7 @@ public class JavaEditor
* <!-- end-user-doc -->
* @generated
*/
- protected PropertySheetPage propertySheetPage;
+ protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
/**
* This is the viewer that shadows the selection in the content outline.
@@ -336,7 +337,7 @@ public class JavaEditor
}
else if (p instanceof PropertySheet)
{
- if (((PropertySheet)p).getCurrentPage() == propertySheetPage)
+ if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage()))
{
getActionBarContributor().setActiveEditor(JavaEditor.this);
handleActivate();
@@ -461,6 +462,18 @@ public class JavaEditor
protected void unsetTarget(Resource target)
{
basicUnsetTarget(target);
+ resourceToDiagnosticMap.remove(target);
+ if (updateProblemIndication)
+ {
+ getSite().getShell().getDisplay().asyncExec
+ (new Runnable()
+ {
+ public void run()
+ {
+ updateProblemIndication();
+ }
+ });
+ }
}
};
@@ -504,6 +517,7 @@ public class JavaEditor
}
}
}
+ return false;
}
return true;
@@ -782,9 +796,17 @@ public class JavaEditor
{
setSelectionToViewer(mostRecentCommand.getAffectedObjects());
}
- if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed())
+ for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); )
{
- propertySheetPage.refresh();
+ PropertySheetPage propertySheetPage = i.next();
+ if (propertySheetPage.getControl().isDisposed())
+ {
+ i.remove();
+ }
+ else
+ {
+ propertySheetPage.refresh();
+ }
}
}
});
@@ -1015,7 +1037,7 @@ public class JavaEditor
getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
- Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance() };
+ Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
}
@@ -1060,11 +1082,12 @@ public class JavaEditor
*/
public Diagnostic analyzeResourceProblems(Resource resource, Exception exception)
{
- if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty())
+ boolean hasErrors = !resource.getErrors().isEmpty();
+ if (hasErrors || !resource.getWarnings().isEmpty())
{
BasicDiagnostic basicDiagnostic =
new BasicDiagnostic
- (Diagnostic.ERROR,
+ (hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
"org.eclipse.emf.java.editor",
0,
getString("_UI_CreateModelError_message", resource.getURI()),
@@ -1520,7 +1543,7 @@ public class JavaEditor
* <!-- end-user-doc -->
* @generated
*/
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public Object getAdapter(Class key)
{
@@ -1623,27 +1646,25 @@ public class JavaEditor
*/
public IPropertySheetPage getPropertySheetPage()
{
- if (propertySheetPage == null)
- {
- propertySheetPage =
- new ExtendedPropertySheetPage(editingDomain)
+ PropertySheetPage propertySheetPage =
+ new ExtendedPropertySheetPage(editingDomain)
+ {
+ @Override
+ public void setSelectionToViewer(List<?> selection)
{
- @Override
- public void setSelectionToViewer(List<?> selection)
- {
- JavaEditor.this.setSelectionToViewer(selection);
- JavaEditor.this.setFocus();
- }
+ JavaEditor.this.setSelectionToViewer(selection);
+ JavaEditor.this.setFocus();
+ }
- @Override
- public void setActionBars(IActionBars actionBars)
- {
- super.setActionBars(actionBars);
- getActionBarContributor().shareGlobalActions(this, actionBars);
- }
- };
- propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
- }
+ @Override
+ public void setActionBars(IActionBars actionBars)
+ {
+ super.setActionBars(actionBars);
+ getActionBarContributor().shareGlobalActions(this, actionBars);
+ }
+ };
+ propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+ propertySheetPages.add(propertySheetPage);
return propertySheetPage;
}
@@ -1719,6 +1740,7 @@ public class JavaEditor
//
final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+ saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
// Do the work within an operation because this is a long running activity that modifies the workbench.
//
@@ -1780,7 +1802,7 @@ public class JavaEditor
/**
* This returns whether something has been persisted to the URI of the specified resource.
- * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
+ * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -1862,25 +1884,10 @@ public class JavaEditor
*/
public void gotoMarker(IMarker marker)
{
- try
+ List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
+ if (!targetObjects.isEmpty())
{
- if (marker.getType().equals(EValidator.MARKER))
- {
- String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);
- if (uriAttribute != null)
- {
- URI uri = URI.createURI(uriAttribute);
- EObject eObject = editingDomain.getResourceSet().getEObject(uri, true);
- if (eObject != null)
- {
- setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));
- }
- }
- }
- }
- catch (CoreException exception)
- {
- JavaEditorPlugin.INSTANCE.log(exception);
+ setSelectionToViewer(targetObjects);
}
}
@@ -2096,7 +2103,7 @@ public class JavaEditor
getActionBarContributor().setActiveEditor(null);
}
- if (propertySheetPage != null)
+ for (PropertySheetPage propertySheetPage : propertySheetPages)
{
propertySheetPage.dispose();
}
diff --git a/examples/org.eclipse.emf.java/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.java/META-INF/MANIFEST.MF
index 8299bf7c8..271580ed4 100644
--- a/examples/org.eclipse.emf.java/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.java/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.java;singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.java.JavaPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JClass.java b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JClass.java
index bbb71b6fb..3593d7a95 100644
--- a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JClass.java
+++ b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JClass.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.java.JClass#isAbstract <em>Abstract</em>}</li>
* <li>{@link org.eclipse.emf.java.JClass#isFinal <em>Final</em>}</li>
@@ -41,7 +42,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link org.eclipse.emf.java.JClass#getTypes <em>Types</em>}</li>
* <li>{@link org.eclipse.emf.java.JClass#getAllTypes <em>All Types</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.java.JavaPackage#getJClass()
* @model
diff --git a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JCompilationUnit.java b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JCompilationUnit.java
index 1a0f54104..b2f529ae3 100644
--- a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JCompilationUnit.java
+++ b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JCompilationUnit.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.java.JCompilationUnit#getImports <em>Imports</em>}</li>
* <li>{@link org.eclipse.emf.java.JCompilationUnit#getComment <em>Comment</em>}</li>
@@ -29,7 +30,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link org.eclipse.emf.java.JCompilationUnit#getImportedTypes <em>Imported Types</em>}</li>
* <li>{@link org.eclipse.emf.java.JCompilationUnit#getPackage <em>Package</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.java.JavaPackage#getJCompilationUnit()
* @model
diff --git a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JField.java b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JField.java
index 039eb86ff..27e3315ed 100644
--- a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JField.java
+++ b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JField.java
@@ -21,6 +21,7 @@ import java.lang.reflect.Field;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.java.JField#isFinal <em>Final</em>}</li>
* <li>{@link org.eclipse.emf.java.JField#isTransient <em>Transient</em>}</li>
@@ -29,7 +30,6 @@ import java.lang.reflect.Field;
* <li>{@link org.eclipse.emf.java.JField#getInitializer <em>Initializer</em>}</li>
* <li>{@link org.eclipse.emf.java.JField#getType <em>Type</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.java.JavaPackage#getJField()
* @model
diff --git a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JInitializer.java b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JInitializer.java
index 238e3ab00..a19941787 100644
--- a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JInitializer.java
+++ b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JInitializer.java
@@ -19,10 +19,10 @@ package org.eclipse.emf.java;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.java.JInitializer#getBody <em>Body</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.java.JavaPackage#getJInitializer()
* @model
diff --git a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JMember.java b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JMember.java
index 752c3e8c3..98a357182 100644
--- a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JMember.java
+++ b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JMember.java
@@ -19,13 +19,13 @@ package org.eclipse.emf.java;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.java.JMember#isStatic <em>Static</em>}</li>
* <li>{@link org.eclipse.emf.java.JMember#getVisibility <em>Visibility</em>}</li>
* <li>{@link org.eclipse.emf.java.JMember#getComment <em>Comment</em>}</li>
* <li>{@link org.eclipse.emf.java.JMember#getContainingType <em>Containing Type</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.java.JavaPackage#getJMember()
* @model abstract="true"
diff --git a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JMethod.java b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JMethod.java
index da5fd4b49..201127b3f 100644
--- a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JMethod.java
+++ b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JMethod.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.java.JMethod#isAbstract <em>Abstract</em>}</li>
* <li>{@link org.eclipse.emf.java.JMethod#isFinal <em>Final</em>}</li>
@@ -37,7 +38,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link org.eclipse.emf.java.JMethod#getExceptions <em>Exceptions</em>}</li>
* <li>{@link org.eclipse.emf.java.JMethod#getReturnType <em>Return Type</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.java.JavaPackage#getJMethod()
* @model
diff --git a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JModelElement.java b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JModelElement.java
index bec2c208b..3364df824 100644
--- a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JModelElement.java
+++ b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JModelElement.java
@@ -21,11 +21,11 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.java.JModelElement#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.java.JModelElement#getJNode <em>JNode</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.java.JavaPackage#getJModelElement()
* @model abstract="true"
diff --git a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JPackage.java b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JPackage.java
index 9572a184e..6e452024a 100644
--- a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JPackage.java
+++ b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JPackage.java
@@ -21,11 +21,11 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.java.JPackage#getJavaPackage <em>Java Package</em>}</li>
* <li>{@link org.eclipse.emf.java.JPackage#getTypes <em>Types</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.java.JavaPackage#getJPackage()
* @model
diff --git a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JParameter.java b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JParameter.java
index eb9578eda..5204fa2fe 100644
--- a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JParameter.java
+++ b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JParameter.java
@@ -19,12 +19,12 @@ package org.eclipse.emf.java;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.java.JParameter#isFinal <em>Final</em>}</li>
* <li>{@link org.eclipse.emf.java.JParameter#getMethod <em>Method</em>}</li>
* <li>{@link org.eclipse.emf.java.JParameter#getType <em>Type</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.java.JavaPackage#getJParameter()
* @model
diff --git a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JVisibility.java b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JVisibility.java
index 8336db5e6..e0537886b 100644
--- a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JVisibility.java
+++ b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/JVisibility.java
@@ -136,6 +136,8 @@ public enum JVisibility implements Enumerator
* Returns the '<em><b>JVisibility</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 JVisibility get(String literal)
@@ -155,6 +157,8 @@ public enum JVisibility implements Enumerator
* Returns the '<em><b>JVisibility</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 JVisibility getByName(String name)
@@ -174,6 +178,8 @@ public enum JVisibility implements Enumerator
* Returns the '<em><b>JVisibility</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 JVisibility get(int value)
diff --git a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JClassImpl.java b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JClassImpl.java
index ac2a64586..619a85006 100644
--- a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JClassImpl.java
+++ b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JClassImpl.java
@@ -54,6 +54,7 @@ import org.eclipse.emf.java.util.JavaUtil;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.java.impl.JClassImpl#isAbstract <em>Abstract</em>}</li>
* <li>{@link org.eclipse.emf.java.impl.JClassImpl#isFinal <em>Final</em>}</li>
@@ -74,7 +75,6 @@ import org.eclipse.emf.java.util.JavaUtil;
* <li>{@link org.eclipse.emf.java.impl.JClassImpl#getTypes <em>Types</em>}</li>
* <li>{@link org.eclipse.emf.java.impl.JClassImpl#getAllTypes <em>All Types</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
@@ -449,7 +449,7 @@ public class JClassImpl extends JMemberImpl implements JClass
public JClass getComponentType()
{
if (eContainerFeatureID() != JavaPackage.JCLASS__COMPONENT_TYPE) return null;
- return (JClass)eContainer();
+ return (JClass)eInternalContainer();
}
/**
@@ -542,7 +542,7 @@ public class JClassImpl extends JMemberImpl implements JClass
public JCompilationUnit getUnit()
{
if (eContainerFeatureID() != JavaPackage.JCLASS__UNIT) return null;
- return (JCompilationUnit)eContainer();
+ return (JCompilationUnit)eInternalContainer();
}
/**
diff --git a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JCompilationUnitImpl.java b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JCompilationUnitImpl.java
index 0fd8b3986..6c06a3017 100644
--- a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JCompilationUnitImpl.java
+++ b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JCompilationUnitImpl.java
@@ -47,6 +47,7 @@ import org.eclipse.emf.java.util.JavaUtil;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.java.impl.JCompilationUnitImpl#getImports <em>Imports</em>}</li>
* <li>{@link org.eclipse.emf.java.impl.JCompilationUnitImpl#getComment <em>Comment</em>}</li>
@@ -55,7 +56,6 @@ import org.eclipse.emf.java.util.JavaUtil;
* <li>{@link org.eclipse.emf.java.impl.JCompilationUnitImpl#getImportedTypes <em>Imported Types</em>}</li>
* <li>{@link org.eclipse.emf.java.impl.JCompilationUnitImpl#getPackage <em>Package</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JFieldImpl.java b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JFieldImpl.java
index f50850004..13fa471fa 100644
--- a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JFieldImpl.java
+++ b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JFieldImpl.java
@@ -32,6 +32,7 @@ import org.eclipse.emf.java.util.JavaUtil;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.java.impl.JFieldImpl#isFinal <em>Final</em>}</li>
* <li>{@link org.eclipse.emf.java.impl.JFieldImpl#isTransient <em>Transient</em>}</li>
@@ -40,7 +41,6 @@ import org.eclipse.emf.java.util.JavaUtil;
* <li>{@link org.eclipse.emf.java.impl.JFieldImpl#getInitializer <em>Initializer</em>}</li>
* <li>{@link org.eclipse.emf.java.impl.JFieldImpl#getType <em>Type</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JInitializerImpl.java b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JInitializerImpl.java
index f43e8382b..199c8e70a 100644
--- a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JInitializerImpl.java
+++ b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JInitializerImpl.java
@@ -29,10 +29,10 @@ import org.eclipse.emf.java.util.JavaUtil;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.java.impl.JInitializerImpl#getBody <em>Body</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JMemberImpl.java b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JMemberImpl.java
index f22d59e45..5f1077a96 100644
--- a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JMemberImpl.java
+++ b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JMemberImpl.java
@@ -29,13 +29,13 @@ import org.eclipse.emf.java.JavaPackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.java.impl.JMemberImpl#isStatic <em>Static</em>}</li>
* <li>{@link org.eclipse.emf.java.impl.JMemberImpl#getVisibility <em>Visibility</em>}</li>
* <li>{@link org.eclipse.emf.java.impl.JMemberImpl#getComment <em>Comment</em>}</li>
* <li>{@link org.eclipse.emf.java.impl.JMemberImpl#getContainingType <em>Containing Type</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
@@ -199,7 +199,7 @@ public abstract class JMemberImpl extends JModelElementImpl implements JMember
public JClass getContainingType()
{
if (eContainerFeatureID() != JavaPackage.JMEMBER__CONTAINING_TYPE) return null;
- return (JClass)eContainer();
+ return (JClass)eInternalContainer();
}
/**
diff --git a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JMethodImpl.java b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JMethodImpl.java
index 275be969b..7be7a14ab 100644
--- a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JMethodImpl.java
+++ b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JMethodImpl.java
@@ -42,6 +42,7 @@ import org.eclipse.emf.java.util.JavaUtil;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.java.impl.JMethodImpl#isAbstract <em>Abstract</em>}</li>
* <li>{@link org.eclipse.emf.java.impl.JMethodImpl#isFinal <em>Final</em>}</li>
@@ -55,7 +56,6 @@ import org.eclipse.emf.java.util.JavaUtil;
* <li>{@link org.eclipse.emf.java.impl.JMethodImpl#getExceptions <em>Exceptions</em>}</li>
* <li>{@link org.eclipse.emf.java.impl.JMethodImpl#getReturnType <em>Return Type</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JModelElementImpl.java b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JModelElementImpl.java
index 3d0df78f7..bebc42b22 100644
--- a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JModelElementImpl.java
+++ b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JModelElementImpl.java
@@ -28,11 +28,11 @@ import org.eclipse.emf.java.JavaPackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.java.impl.JModelElementImpl#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.java.impl.JModelElementImpl#getJNode <em>JNode</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JPackageImpl.java b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JPackageImpl.java
index b4ac8c8cc..6d99b4427 100644
--- a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JPackageImpl.java
+++ b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JPackageImpl.java
@@ -34,11 +34,11 @@ import org.eclipse.emf.java.JavaPackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.java.impl.JPackageImpl#getJavaPackage <em>Java Package</em>}</li>
* <li>{@link org.eclipse.emf.java.impl.JPackageImpl#getTypes <em>Types</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JParameterImpl.java b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JParameterImpl.java
index d7364a3d3..04f96fe92 100644
--- a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JParameterImpl.java
+++ b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JParameterImpl.java
@@ -29,12 +29,12 @@ import org.eclipse.emf.java.JavaPackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.java.impl.JParameterImpl#isFinal <em>Final</em>}</li>
* <li>{@link org.eclipse.emf.java.impl.JParameterImpl#getMethod <em>Method</em>}</li>
* <li>{@link org.eclipse.emf.java.impl.JParameterImpl#getType <em>Type</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
@@ -122,7 +122,7 @@ public class JParameterImpl extends JModelElementImpl implements JParameter
public JMethod getMethod()
{
if (eContainerFeatureID() != JavaPackage.JPARAMETER__METHOD) return null;
- return (JMethod)eContainer();
+ return (JMethod)eInternalContainer();
}
/**
diff --git a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JavaFactoryImpl.java b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JavaFactoryImpl.java
index 32c6eeb77..179745906 100644
--- a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JavaFactoryImpl.java
+++ b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JavaFactoryImpl.java
@@ -41,7 +41,7 @@ public class JavaFactoryImpl extends EFactoryImpl implements JavaFactory
{
try
{
- JavaFactory theJavaFactory = (JavaFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/2002/Java");
+ JavaFactory theJavaFactory = (JavaFactory)EPackage.Registry.INSTANCE.getEFactory(JavaPackage.eNS_URI);
if (theJavaFactory != null)
{
return theJavaFactory;
diff --git a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/util/JavaSwitch.java b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/util/JavaSwitch.java
index d73ab1c73..50231a7e1 100644
--- a/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/util/JavaSwitch.java
+++ b/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/util/JavaSwitch.java
@@ -11,10 +11,9 @@
package org.eclipse.emf.java.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.java.*;
@@ -31,7 +30,7 @@ import org.eclipse.emf.java.*;
* @see org.eclipse.emf.java.JavaPackage
* @generated
*/
-public class JavaSwitch<T> {
+public class JavaSwitch<T> extends Switch<T> {
/**
* The cached model package
* <!-- begin-user-doc -->
@@ -55,38 +54,17 @@ public class JavaSwitch<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;
}
/**
@@ -96,6 +74,7 @@ public class JavaSwitch<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)
@@ -334,6 +313,7 @@ public class JavaSwitch<T> {
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
*/
+ @Override
public T defaultCase(EObject object)
{
return null;
diff --git a/features/org.eclipse.emf.codegen-feature/feature.xml b/features/org.eclipse.emf.codegen-feature/feature.xml
index e471efefa..ea0e1dc01 100644
--- a/features/org.eclipse.emf.codegen-feature/feature.xml
+++ b/features/org.eclipse.emf.codegen-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.codegen"
label="%featureName"
- version="2.10.0.qualifier"
+ version="2.11.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.codegen.ecore.ui-feature/feature.xml b/features/org.eclipse.emf.codegen.ecore.ui-feature/feature.xml
index 12cf555f4..46ce33f51 100644
--- a/features/org.eclipse.emf.codegen.ecore.ui-feature/feature.xml
+++ b/features/org.eclipse.emf.codegen.ecore.ui-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.codegen.ecore.ui"
label="%featureName"
- version="2.10.0.qualifier"
+ version="2.11.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.common.ui-feature/feature.xml b/features/org.eclipse.emf.common.ui-feature/feature.xml
index 82c40c7c2..f89eaf5a8 100644
--- a/features/org.eclipse.emf.common.ui-feature/feature.xml
+++ b/features/org.eclipse.emf.common.ui-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.common.ui"
label="%featureName"
- version="2.9.0.qualifier"
+ version="2.10.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.converter-feature/feature.xml b/features/org.eclipse.emf.converter-feature/feature.xml
index de7e94a4c..db3fea7f4 100644
--- a/features/org.eclipse.emf.converter-feature/feature.xml
+++ b/features/org.eclipse.emf.converter-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.converter"
label="%featureName"
- version="2.10.0.qualifier"
+ version="2.11.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.mapping-feature/feature.xml b/features/org.eclipse.emf.mapping-feature/feature.xml
index d617eb55d..2eaefefb4 100644
--- a/features/org.eclipse.emf.mapping-feature/feature.xml
+++ b/features/org.eclipse.emf.mapping-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.mapping"
label="%featureName"
- version="2.8.0.qualifier"
+ version="2.9.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.mapping.ecore-feature/feature.xml b/features/org.eclipse.emf.mapping.ecore-feature/feature.xml
index 5c28e055a..192fda7be 100644
--- a/features/org.eclipse.emf.mapping.ecore-feature/feature.xml
+++ b/features/org.eclipse.emf.mapping.ecore-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.mapping.ecore"
label="%featureName"
- version="2.8.0.qualifier"
+ version="2.9.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.mapping.ecore.editor-feature/feature.xml b/features/org.eclipse.emf.mapping.ecore.editor-feature/feature.xml
index 60f5be704..169e3993e 100644
--- a/features/org.eclipse.emf.mapping.ecore.editor-feature/feature.xml
+++ b/features/org.eclipse.emf.mapping.ecore.editor-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.mapping.ecore.editor"
label="%featureName"
- version="2.9.0.qualifier"
+ version="2.10.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.mapping.ui-feature/feature.xml b/features/org.eclipse.emf.mapping.ui-feature/feature.xml
index e159ed43d..722471bd5 100644
--- a/features/org.eclipse.emf.mapping.ui-feature/feature.xml
+++ b/features/org.eclipse.emf.mapping.ui-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.mapping.ui"
label="%featureName"
- version="2.8.0.qualifier"
+ version="2.9.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.rap.common.ui-feature/feature.xml b/features/org.eclipse.emf.rap.common.ui-feature/feature.xml
index 0c92fa2fd..8abd74d6c 100755
--- a/features/org.eclipse.emf.rap.common.ui-feature/feature.xml
+++ b/features/org.eclipse.emf.rap.common.ui-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.rap.common.ui"
label="%featureName"
- version="2.8.0.qualifier"
+ version="2.9.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/plugins/org.eclipse.emf.codegen.ecore.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.codegen.ecore.ui/META-INF/MANIFEST.MF
index 890fc7c11..11a85a3aa 100644
--- a/plugins/org.eclipse.emf.codegen.ecore.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.codegen.ecore.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.codegen.ecore.ui; singleton:=true
-Bundle-Version: 2.10.0.qualifier
+Bundle-Version: 2.11.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.codegen.ecore.genmodel.provider.GenModelEditPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/GenModelEditor.java b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/GenModelEditor.java
index 05ada1d8d..bba5c9d33 100644
--- a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/GenModelEditor.java
+++ b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/GenModelEditor.java
@@ -1044,11 +1044,12 @@ public class GenModelEditor
*/
public Diagnostic analyzeResourceProblems(Resource resource, Exception exception)
{
- if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty())
+ boolean hasErrors = !resource.getErrors().isEmpty();
+ if (hasErrors || !resource.getWarnings().isEmpty())
{
BasicDiagnostic basicDiagnostic =
new BasicDiagnostic
- (Diagnostic.ERROR,
+ (hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
"org.eclipse.emf.codegen.ecore.ui",
0,
getString("_UI_CreateModelError_message", resource.getURI()),
@@ -1203,7 +1204,7 @@ public class GenModelEditor
* <!-- end-user-doc -->
* @generated
*/
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public Object getAdapter(Class key)
{
diff --git a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenAnnotationItemProvider.java b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenAnnotationItemProvider.java
index 3eb94ee41..fd9843ea5 100644
--- a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenAnnotationItemProvider.java
+++ b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenAnnotationItemProvider.java
@@ -20,12 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
@@ -36,13 +31,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
* @generated
*/
public class GenAnnotationItemProvider
- extends GenBaseItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
+ extends GenBaseItemProvider
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenClassItemProvider.java b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenClassItemProvider.java
index 4ff513e96..9ae817f3f 100644
--- a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenClassItemProvider.java
+++ b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenClassItemProvider.java
@@ -23,12 +23,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
@@ -44,8 +39,6 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
*/
public class GenClassItemProvider
extends GenBaseItemProvider
- implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenDataTypeItemProvider.java b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenDataTypeItemProvider.java
index b60888e54..6852b6759 100644
--- a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenDataTypeItemProvider.java
+++ b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenDataTypeItemProvider.java
@@ -19,13 +19,7 @@ import org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
import org.eclipse.emf.edit.provider.ViewerNotification;
// import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
@@ -39,8 +33,6 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
*/
public class GenDataTypeItemProvider
extends GenBaseItemProvider
- implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenEnumItemProvider.java b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenEnumItemProvider.java
index fde3c0f86..f9f461618 100644
--- a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenEnumItemProvider.java
+++ b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenEnumItemProvider.java
@@ -20,12 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
@@ -39,8 +34,6 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
*/
public class GenEnumItemProvider
extends GenDataTypeItemProvider
- implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenEnumLiteralItemProvider.java b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenEnumLiteralItemProvider.java
index 4816d86fe..c2f647276 100644
--- a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenEnumLiteralItemProvider.java
+++ b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenEnumLiteralItemProvider.java
@@ -18,13 +18,7 @@ import org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
import org.eclipse.emf.edit.provider.ViewerNotification;
// import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
@@ -38,8 +32,6 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
*/
public class GenEnumLiteralItemProvider
extends GenBaseItemProvider
- implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenFeatureItemProvider.java b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenFeatureItemProvider.java
index f3468b065..2fd7ac15c 100644
--- a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenFeatureItemProvider.java
+++ b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenFeatureItemProvider.java
@@ -20,12 +20,7 @@ import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
@@ -41,8 +36,6 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
*/
public class GenFeatureItemProvider
extends GenBaseItemProvider
- implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenModelItemProvider.java b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenModelItemProvider.java
index abe72adf8..a4e735101 100644
--- a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenModelItemProvider.java
+++ b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenModelItemProvider.java
@@ -29,12 +29,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.command.SetCommand;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
@@ -48,8 +43,6 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
*/
public class GenModelItemProvider
extends GenBaseItemProvider
- implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenOperationItemProvider.java b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenOperationItemProvider.java
index 00191f81c..87b5cb576 100644
--- a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenOperationItemProvider.java
+++ b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenOperationItemProvider.java
@@ -22,13 +22,7 @@ import org.eclipse.emf.ecore.EClassifier;
import org.eclipse.emf.ecore.EOperation;
import org.eclipse.emf.ecore.EParameter;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
import org.eclipse.emf.edit.provider.ViewerNotification;
// import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
@@ -42,8 +36,6 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
*/
public class GenOperationItemProvider
extends GenBaseItemProvider
- implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenPackageItemProvider.java b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenPackageItemProvider.java
index 00956955e..3cdab6e6f 100644
--- a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenPackageItemProvider.java
+++ b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenPackageItemProvider.java
@@ -24,12 +24,7 @@ import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
@@ -43,8 +38,6 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
*/
public class GenPackageItemProvider
extends GenBaseItemProvider
- implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenAnnotation.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenAnnotation.java
index 5b27b6db5..8dee7375a 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenAnnotation.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenAnnotation.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenAnnotation#getSource <em>Source</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenAnnotation#getDetails <em>Details</em>}</li>
@@ -28,7 +29,6 @@ import org.eclipse.emf.ecore.EObject;
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenAnnotation#getReferences <em>References</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenAnnotation#getContents <em>Contents</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage#getGenAnnotation()
* @model
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenBase.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenBase.java
index 303d5c313..dfe53cb9a 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenBase.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenBase.java
@@ -27,10 +27,10 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenBase#getGenAnnotations <em>Gen Annotations</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage#getGenBase()
* @model abstract="true"
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenClass.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenClass.java
index 37b6e7e4e..6ac21b6e2 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenClass.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenClass.java
@@ -25,6 +25,7 @@ import org.eclipse.emf.ecore.EClass;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenClass#getProvider <em>Provider</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenClass#isImage <em>Image</em>}</li>
@@ -34,7 +35,6 @@ import org.eclipse.emf.ecore.EClass;
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenClass#getGenOperations <em>Gen Operations</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenClass#getLabelFeature <em>Label Feature</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage#getGenClass()
* @model
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenClassifier.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenClassifier.java
index 0fb816a89..dec82a0e3 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenClassifier.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenClassifier.java
@@ -24,11 +24,11 @@ import org.eclipse.emf.ecore.EClassifier;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenClassifier#getGenPackage <em>Gen Package</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenClassifier#getGenTypeParameters <em>Gen Type Parameters</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage#getGenClassifier()
* @model abstract="true"
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenDataType.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenDataType.java
index 018e3d673..a952193c0 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenDataType.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenDataType.java
@@ -23,10 +23,10 @@ import org.eclipse.emf.ecore.EDataType;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenDataType#getEcoreDataType <em>Ecore Data Type</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage#getGenDataType()
* @model
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenDecoration.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenDecoration.java
index 85770c421..490cca41e 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenDecoration.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenDecoration.java
@@ -126,6 +126,8 @@ public enum GenDecoration implements Enumerator
* Returns the '<em><b>Gen Decoration</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 GenDecoration get(String literal)
@@ -145,6 +147,8 @@ public enum GenDecoration implements Enumerator
* Returns the '<em><b>Gen Decoration</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 GenDecoration getByName(String name)
@@ -164,6 +168,8 @@ public enum GenDecoration implements Enumerator
* Returns the '<em><b>Gen Decoration</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 GenDecoration get(int value)
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenDelegationKind.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenDelegationKind.java
index 21f016362..47ca3d10f 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenDelegationKind.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenDelegationKind.java
@@ -138,6 +138,8 @@ public enum GenDelegationKind implements Enumerator
* Returns the '<em><b>Gen Delegation Kind</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 GenDelegationKind get(String literal)
@@ -157,6 +159,8 @@ public enum GenDelegationKind implements Enumerator
* Returns the '<em><b>Gen Delegation Kind</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 GenDelegationKind getByName(String name)
@@ -176,6 +180,8 @@ public enum GenDelegationKind implements Enumerator
* Returns the '<em><b>Gen Delegation Kind</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 GenDelegationKind get(int value)
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenEnum.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenEnum.java
index c5d40fcab..436443a75 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenEnum.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenEnum.java
@@ -24,12 +24,12 @@ import org.eclipse.emf.ecore.EEnum;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenEnum#isTypeSafeEnumCompatible <em>Type Safe Enum Compatible</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenEnum#getEcoreEnum <em>Ecore Enum</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenEnum#getGenEnumLiterals <em>Gen Enum Literals</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage#getGenEnum()
* @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='NoEcoreDataType'"
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenEnumLiteral.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenEnumLiteral.java
index f175566e2..c14ae1339 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenEnumLiteral.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenEnumLiteral.java
@@ -21,11 +21,11 @@ import org.eclipse.emf.ecore.EEnumLiteral;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenEnumLiteral#getGenEnum <em>Gen Enum</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenEnumLiteral#getEcoreEnumLiteral <em>Ecore Enum Literal</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage#getGenEnumLiteral()
* @model
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenFeature.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenFeature.java
index 8b4fa9a03..abec411a2 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenFeature.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenFeature.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenFeature#getProperty <em>Property</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenFeature#isNotify <em>Notify</em>}</li>
@@ -37,7 +38,6 @@ import org.eclipse.emf.ecore.EStructuralFeature;
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenFeature#getGenClass <em>Gen Class</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenFeature#getEcoreFeature <em>Ecore Feature</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage#getGenFeature()
* @model
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenJDKLevel.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenJDKLevel.java
index c75b2f305..cb7b2d392 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenJDKLevel.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenJDKLevel.java
@@ -158,6 +158,8 @@ public enum GenJDKLevel implements Enumerator
* Returns the '<em><b>Gen JDK Level</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 GenJDKLevel get(String literal)
@@ -177,6 +179,8 @@ public enum GenJDKLevel implements Enumerator
* Returns the '<em><b>Gen JDK Level</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 GenJDKLevel getByName(String name)
@@ -196,6 +200,8 @@ public enum GenJDKLevel implements Enumerator
* Returns the '<em><b>Gen JDK Level</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 GenJDKLevel get(int value)
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenModel.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenModel.java
index 7480fff73..a9e4714cd 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenModel.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenModel.java
@@ -41,6 +41,7 @@ import org.eclipse.jdt.core.formatter.CodeFormatter;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenModel#getCopyrightText <em>Copyright Text</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenModel#getModelDirectory <em>Model Directory</em>}</li>
@@ -129,7 +130,6 @@ import org.eclipse.jdt.core.formatter.CodeFormatter;
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenModel#isCleanup <em>Cleanup</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenModel#isOSGiCompatible <em>OS Gi Compatible</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage#getGenModel()
* @model
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenOperation.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenOperation.java
index 289476a7e..0d61ddbdf 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenOperation.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenOperation.java
@@ -24,13 +24,13 @@ import org.eclipse.emf.ecore.EOperation;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenOperation#getGenClass <em>Gen Class</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenOperation#getEcoreOperation <em>Ecore Operation</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenOperation#getGenParameters <em>Gen Parameters</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenOperation#getGenTypeParameters <em>Gen Type Parameters</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage#getGenOperation()
* @model
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenPackage.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenPackage.java
index 0b5c3f1f8..d0f42b94e 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenPackage.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenPackage.java
@@ -26,6 +26,7 @@ import org.eclipse.emf.ecore.EPackage;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenPackage#getPrefix <em>Prefix</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenPackage#getBasePackage <em>Base Package</em>}</li>
@@ -58,7 +59,6 @@ import org.eclipse.emf.ecore.EPackage;
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenPackage#getGenClassifiers <em>Gen Classifiers</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenPackage#getPublicationLocation <em>Publication Location</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage#getGenPackage()
* @model
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenParameter.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenParameter.java
index fdea94b7c..39ad6552a 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenParameter.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenParameter.java
@@ -21,11 +21,11 @@ import org.eclipse.emf.ecore.EParameter;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenParameter#getGenOperation <em>Gen Operation</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenParameter#getEcoreParameter <em>Ecore Parameter</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage#getGenParameter()
* @model
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenPropertyKind.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenPropertyKind.java
index 33213933e..c2e1e6253 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenPropertyKind.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenPropertyKind.java
@@ -113,6 +113,8 @@ public enum GenPropertyKind implements Enumerator
* Returns the '<em><b>Gen Property Kind</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 GenPropertyKind get(String literal)
@@ -132,6 +134,8 @@ public enum GenPropertyKind implements Enumerator
* Returns the '<em><b>Gen Property Kind</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 GenPropertyKind getByName(String name)
@@ -151,6 +155,8 @@ public enum GenPropertyKind implements Enumerator
* Returns the '<em><b>Gen Property Kind</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 GenPropertyKind get(int value)
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenProviderKind.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenProviderKind.java
index 9d195b746..e102b672e 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenProviderKind.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenProviderKind.java
@@ -113,6 +113,8 @@ public enum GenProviderKind implements Enumerator
* Returns the '<em><b>Gen Provider Kind</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 GenProviderKind get(String literal)
@@ -132,6 +134,8 @@ public enum GenProviderKind implements Enumerator
* Returns the '<em><b>Gen Provider Kind</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 GenProviderKind getByName(String name)
@@ -151,6 +155,8 @@ public enum GenProviderKind implements Enumerator
* Returns the '<em><b>Gen Provider Kind</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 GenProviderKind get(int value)
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenResourceKind.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenResourceKind.java
index a1ffd924c..15fd3b8ba 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenResourceKind.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenResourceKind.java
@@ -134,6 +134,8 @@ public enum GenResourceKind implements Enumerator
* Returns the '<em><b>Gen Resource Kind</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 GenResourceKind get(String literal)
@@ -153,6 +155,8 @@ public enum GenResourceKind implements Enumerator
* Returns the '<em><b>Gen Resource Kind</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 GenResourceKind getByName(String name)
@@ -172,6 +176,8 @@ public enum GenResourceKind implements Enumerator
* Returns the '<em><b>Gen Resource Kind</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 GenResourceKind get(int value)
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenRuntimePlatform.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenRuntimePlatform.java
index 55d1dea3a..7e09f8db4 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenRuntimePlatform.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenRuntimePlatform.java
@@ -150,6 +150,8 @@ public enum GenRuntimePlatform implements Enumerator
* Returns the '<em><b>Gen Runtime Platform</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 GenRuntimePlatform get(String literal)
@@ -169,6 +171,8 @@ public enum GenRuntimePlatform implements Enumerator
* Returns the '<em><b>Gen Runtime Platform</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 GenRuntimePlatform getByName(String name)
@@ -188,6 +192,8 @@ public enum GenRuntimePlatform implements Enumerator
* Returns the '<em><b>Gen Runtime Platform</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 GenRuntimePlatform get(int value)
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenRuntimeVersion.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenRuntimeVersion.java
index 41779b7b0..55786eab5 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenRuntimeVersion.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenRuntimeVersion.java
@@ -247,6 +247,8 @@ public enum GenRuntimeVersion implements Enumerator
* Returns the '<em><b>Gen Runtime Version</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 GenRuntimeVersion get(String literal)
@@ -266,6 +268,8 @@ public enum GenRuntimeVersion implements Enumerator
* Returns the '<em><b>Gen Runtime Version</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 GenRuntimeVersion getByName(String name)
@@ -285,6 +289,8 @@ public enum GenRuntimeVersion implements Enumerator
* Returns the '<em><b>Gen Runtime Version</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 GenRuntimeVersion get(int value)
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenTypeParameter.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenTypeParameter.java
index 195eded4d..3fc7b8826 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenTypeParameter.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenTypeParameter.java
@@ -19,10 +19,10 @@ import org.eclipse.emf.ecore.ETypeParameter;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.GenTypeParameter#getEcoreTypeParameter <em>Ecore Type Parameter</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage#getGenTypeParameter()
* @model
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenAnnotationImpl.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenAnnotationImpl.java
index 156b4da9d..e177e189b 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenAnnotationImpl.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenAnnotationImpl.java
@@ -38,6 +38,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenAnnotationImpl#getSource <em>Source</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenAnnotationImpl#getDetails <em>Details</em>}</li>
@@ -45,7 +46,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenAnnotationImpl#getReferences <em>References</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenAnnotationImpl#getContents <em>Contents</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenBaseImpl.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenBaseImpl.java
index 70ccc9575..d643bd282 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenBaseImpl.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenBaseImpl.java
@@ -115,10 +115,10 @@ import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenBaseImpl#getGenAnnotations <em>Gen Annotations</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenClassImpl.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenClassImpl.java
index f436df449..fd6aafefd 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenClassImpl.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenClassImpl.java
@@ -70,6 +70,7 @@ import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenClassImpl#getProvider <em>Provider</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenClassImpl#isImage <em>Image</em>}</li>
@@ -79,7 +80,6 @@ import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenClassImpl#getGenOperations <em>Gen Operations</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenClassImpl#getLabelFeature <em>Label Feature</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenClassifierImpl.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenClassifierImpl.java
index 1af46849b..61eb78d6e 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenClassifierImpl.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenClassifierImpl.java
@@ -37,11 +37,11 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenClassifierImpl#getGenPackage <em>Gen Package</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenClassifierImpl#getGenTypeParameters <em>Gen Type Parameters</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenDataTypeImpl.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenDataTypeImpl.java
index 2337d3e75..eb4a4e3fc 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenDataTypeImpl.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenDataTypeImpl.java
@@ -46,10 +46,10 @@ import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenDataTypeImpl#getEcoreDataType <em>Ecore Data Type</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenEnumImpl.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenEnumImpl.java
index eb75d44d9..0ac083455 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenEnumImpl.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenEnumImpl.java
@@ -46,12 +46,12 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenEnumImpl#isTypeSafeEnumCompatible <em>Type Safe Enum Compatible</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenEnumImpl#getEcoreEnum <em>Ecore Enum</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenEnumImpl#getGenEnumLiterals <em>Gen Enum Literals</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenEnumLiteralImpl.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenEnumLiteralImpl.java
index 7cc28a9f5..f010e9c8e 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenEnumLiteralImpl.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenEnumLiteralImpl.java
@@ -33,11 +33,11 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenEnumLiteralImpl#getGenEnum <em>Gen Enum</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenEnumLiteralImpl#getEcoreEnumLiteral <em>Ecore Enum Literal</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenFeatureImpl.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenFeatureImpl.java
index c63178ed2..719882477 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenFeatureImpl.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenFeatureImpl.java
@@ -56,6 +56,7 @@ import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenFeatureImpl#getProperty <em>Property</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenFeatureImpl#isNotify <em>Notify</em>}</li>
@@ -69,7 +70,6 @@ import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenFeatureImpl#getGenClass <em>Gen Class</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenFeatureImpl#getEcoreFeature <em>Ecore Feature</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelImpl.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelImpl.java
index 9e70a78eb..5309d68d1 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelImpl.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelImpl.java
@@ -124,6 +124,7 @@ import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenModelImpl#getCopyrightText <em>Copyright Text</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenModelImpl#getModelDirectory <em>Model Directory</em>}</li>
@@ -212,7 +213,6 @@ import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenModelImpl#isCleanup <em>Cleanup</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenModelImpl#isOSGiCompatible <em>OS Gi Compatible</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenOperationImpl.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenOperationImpl.java
index 0e9e7a821..2c6d2cbb9 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenOperationImpl.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenOperationImpl.java
@@ -52,13 +52,13 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenOperationImpl#getGenClass <em>Gen Class</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenOperationImpl#getEcoreOperation <em>Ecore Operation</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenOperationImpl#getGenParameters <em>Gen Parameters</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenOperationImpl#getGenTypeParameters <em>Gen Type Parameters</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenPackageImpl.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenPackageImpl.java
index 5d5c5682f..5a7ea60b2 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenPackageImpl.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenPackageImpl.java
@@ -95,6 +95,7 @@ import org.osgi.framework.Bundle;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenPackageImpl#getPrefix <em>Prefix</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenPackageImpl#getBasePackage <em>Base Package</em>}</li>
@@ -127,7 +128,6 @@ import org.osgi.framework.Bundle;
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenPackageImpl#getGenClassifiers <em>Gen Classifiers</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenPackageImpl#getPublicationLocation <em>Publication Location</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenParameterImpl.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenParameterImpl.java
index 2537416f9..e989ce8a9 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenParameterImpl.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenParameterImpl.java
@@ -39,11 +39,11 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenParameterImpl#getGenOperation <em>Gen Operation</em>}</li>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenParameterImpl#getEcoreParameter <em>Ecore Parameter</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenTypeParameterImpl.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenTypeParameterImpl.java
index 3afb6ac36..e22a725aa 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenTypeParameterImpl.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenTypeParameterImpl.java
@@ -29,10 +29,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.codegen.ecore.genmodel.impl.GenTypeParameterImpl#getEcoreTypeParameter <em>Ecore Type Parameter</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenTypedElementImpl.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenTypedElementImpl.java
index b0c95f09b..315f29bc4 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenTypedElementImpl.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenTypedElementImpl.java
@@ -41,8 +41,6 @@ import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Gen Typed Element</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/util/GenModelSwitch.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/util/GenModelSwitch.java
index ee9b30fea..4b8d06e9c 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/util/GenModelSwitch.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/util/GenModelSwitch.java
@@ -57,7 +57,7 @@ public class GenModelSwitch<T> extends Switch<T> {
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/plugins/org.eclipse.emf.codegen/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.codegen/META-INF/MANIFEST.MF
index 98dc06fa6..01e1fc67a 100644
--- a/plugins/org.eclipse.emf.codegen/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.codegen/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.codegen; singleton:=true
-Bundle-Version: 2.10.0.qualifier
+Bundle-Version: 2.11.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.codegen.CodeGenPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jet/JETEmitter.java b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jet/JETEmitter.java
index 61587f83a..49ae247ef 100644
--- a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jet/JETEmitter.java
+++ b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jet/JETEmitter.java
@@ -39,7 +39,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
-
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
@@ -63,7 +62,6 @@ import org.eclipse.jdt.core.IJavaModel;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.JavaCore;
-
import org.eclipse.emf.codegen.CodeGenPlugin;
import org.eclipse.emf.codegen.util.CodeGenUtil;
import org.eclipse.emf.common.CommonPlugin;
@@ -824,6 +822,7 @@ public class JETEmitter
// Define a class loader that looks up classes using the URLs or the parent class loader,
// and failing those, tries to look up the class in each bundle in the running JVM.
//
+ @SuppressWarnings("resource")
URLClassLoader theClassLoader =
new URLClassLoader(urls.toArray(new URL [0]), jetEmitter.classLoader)
{
diff --git a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/ast/ASTJField.java b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/ast/ASTJField.java
index 6b634f762..1a79add06 100644
--- a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/ast/ASTJField.java
+++ b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/ast/ASTJField.java
@@ -21,7 +21,6 @@ import org.eclipse.jdt.core.dom.IExtendedModifier;
import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
import org.eclipse.jdt.core.dom.rewrite.ListRewrite;
-
import org.eclipse.emf.codegen.merge.java.facade.JField;
@@ -312,6 +311,7 @@ public class ASTJField extends ASTJMember<FieldDeclaration> implements JField
*
* @see org.eclipse.emf.codegen.merge.java.facade.JField#setType(String)
*/
+ @SuppressWarnings("deprecation")
public void setType(String type)
{
// if there are multiple variables in declaration,
diff --git a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/ast/ASTJMethod.java b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/ast/ASTJMethod.java
index a634da18d..6d7d512a2 100644
--- a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/ast/ASTJMethod.java
+++ b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/ast/ASTJMethod.java
@@ -17,7 +17,6 @@ import org.eclipse.jdt.core.dom.ASTNode;
import org.eclipse.jdt.core.dom.MethodDeclaration;
import org.eclipse.jdt.core.dom.Name;
import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-
import org.eclipse.emf.codegen.merge.java.facade.JMethod;
@@ -111,6 +110,7 @@ public class ASTJMethod extends ASTJMember<MethodDeclaration> implements JMethod
return returnType;
}
+ @SuppressWarnings("deprecation")
public void setReturnType(String type)
{
this.returnType = type;
@@ -261,7 +261,7 @@ public class ASTJMethod extends ASTJMember<MethodDeclaration> implements JMethod
{
if (exceptions == EMPTY_STRING_ARRAY)
{
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "deprecation" })
List<Name> exceptionsList = getASTNode().thrownExceptions();
exceptions = new String [exceptionsList.size()];
@@ -275,6 +275,7 @@ public class ASTJMethod extends ASTJMember<MethodDeclaration> implements JMethod
return exceptions;
}
+ @SuppressWarnings("deprecation")
public void setExceptions(String[] exceptionTypes)
{
this.exceptions = exceptionTypes;
@@ -282,7 +283,8 @@ public class ASTJMethod extends ASTJMember<MethodDeclaration> implements JMethod
setListNodeProperty(getASTNode(), exceptionTypes, MethodDeclaration.THROWN_EXCEPTIONS_PROPERTY, ASTNode.SIMPLE_NAME);
}
- public void addException(String exceptionType)
+ @SuppressWarnings("deprecation")
+public void addException(String exceptionType)
{
if (addedExceptions == null)
{
diff --git a/plugins/org.eclipse.emf.common.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.common.ui/META-INF/MANIFEST.MF
index 624e9ff66..578a0b288 100644
--- a/plugins/org.eclipse.emf.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.common.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.common.ui;singleton:=true
-Bundle-Version: 2.9.0.qualifier
+Bundle-Version: 2.10.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.common.ui.CommonUIPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.common.ui/src/org/eclipse/emf/common/ui/URIEditorInput.java b/plugins/org.eclipse.emf.common.ui/src/org/eclipse/emf/common/ui/URIEditorInput.java
index 2418b71f6..44632e3b7 100644
--- a/plugins/org.eclipse.emf.common.ui/src/org/eclipse/emf/common/ui/URIEditorInput.java
+++ b/plugins/org.eclipse.emf.common.ui/src/org/eclipse/emf/common/ui/URIEditorInput.java
@@ -129,7 +129,7 @@ public class URIEditorInput implements IEditorInput, IPersistableElement
return this;
}
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({ "rawtypes", "unchecked" })
public Object getAdapter(Class adapter)
{
if (EMFPlugin.IS_RESOURCES_BUNDLE_AVAILABLE)
diff --git a/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/SegmentSequence.java b/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/SegmentSequence.java
index ef8adbbad..9ec7b62ea 100644
--- a/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/SegmentSequence.java
+++ b/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/SegmentSequence.java
@@ -2878,7 +2878,7 @@ public final class SegmentSequence implements CharSequence
{
throw new NullPointerException("delimiter=null");
}
- this.delimiter = delimiter == null ? "" : delimiter;
+ this.delimiter = delimiter;
strings = new String[capacity];
}
diff --git a/plugins/org.eclipse.emf.ecore.change/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.ecore.change/META-INF/MANIFEST.MF
index cd79dbe5e..2859eda99 100644
--- a/plugins/org.eclipse.emf.ecore.change/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.ecore.change/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecore.change;singleton:=true
-Bundle-Version: 2.10.0.qualifier
+Bundle-Version: 2.11.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.ecore.change.ChangePlugin$Implementation$Activator
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/ChangeDescription.java b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/ChangeDescription.java
index 6566dd8e6..0169ed009 100644
--- a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/ChangeDescription.java
+++ b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/ChangeDescription.java
@@ -25,13 +25,13 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.change.ChangeDescription#getObjectChanges <em>Object Changes</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.ChangeDescription#getObjectsToDetach <em>Objects To Detach</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.ChangeDescription#getObjectsToAttach <em>Objects To Attach</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.ChangeDescription#getResourceChanges <em>Resource Changes</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.change.ChangePackage#getChangeDescription()
* @model
diff --git a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/ChangeKind.java b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/ChangeKind.java
index f59b18b52..eced1b6a5 100644
--- a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/ChangeKind.java
+++ b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/ChangeKind.java
@@ -118,6 +118,8 @@ public enum ChangeKind implements Enumerator
* Returns the '<em><b>Kind</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 ChangeKind get(String literal)
@@ -137,6 +139,8 @@ public enum ChangeKind implements Enumerator
* Returns the '<em><b>Kind</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 ChangeKind getByName(String name)
@@ -156,6 +160,8 @@ public enum ChangeKind implements Enumerator
* Returns the '<em><b>Kind</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 ChangeKind get(int value)
diff --git a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/FeatureChange.java b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/FeatureChange.java
index 528a5cf88..1b7df89e6 100644
--- a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/FeatureChange.java
+++ b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/FeatureChange.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.change.FeatureChange#getFeatureName <em>Feature Name</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.FeatureChange#getDataValue <em>Data Value</em>}</li>
@@ -32,7 +33,6 @@ import org.eclipse.emf.ecore.EStructuralFeature;
* <li>{@link org.eclipse.emf.ecore.change.FeatureChange#getReferenceValue <em>Reference Value</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.FeatureChange#getListChanges <em>List Changes</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.change.ChangePackage#getFeatureChange()
* @model
diff --git a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/FeatureMapEntry.java b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/FeatureMapEntry.java
index 16b152bfb..f541d2bd8 100644
--- a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/FeatureMapEntry.java
+++ b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/FeatureMapEntry.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.change.FeatureMapEntry#getFeatureName <em>Feature Name</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.FeatureMapEntry#getDataValue <em>Data Value</em>}</li>
@@ -27,7 +28,6 @@ import org.eclipse.emf.ecore.EStructuralFeature;
* <li>{@link org.eclipse.emf.ecore.change.FeatureMapEntry#getFeature <em>Feature</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.FeatureMapEntry#getReferenceValue <em>Reference Value</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.change.ChangePackage#getFeatureMapEntry()
* @model
diff --git a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/ListChange.java b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/ListChange.java
index cd4c758ab..575be4ef3 100644
--- a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/ListChange.java
+++ b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/ListChange.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.change.ListChange#getKind <em>Kind</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.ListChange#getDataValues <em>Data Values</em>}</li>
@@ -33,7 +34,6 @@ import org.eclipse.emf.ecore.EStructuralFeature;
* <li>{@link org.eclipse.emf.ecore.change.ListChange#getFeature <em>Feature</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.ListChange#getFeatureMapEntryValues <em>Feature Map Entry Values</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.change.ChangePackage#getListChange()
* @model
diff --git a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/ResourceChange.java b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/ResourceChange.java
index 1e76c353b..44ea1d94b 100644
--- a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/ResourceChange.java
+++ b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/ResourceChange.java
@@ -21,13 +21,13 @@ import org.eclipse.emf.ecore.resource.Resource;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.change.ResourceChange#getResourceURI <em>Resource URI</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.ResourceChange#getResource <em>Resource</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.ResourceChange#getValue <em>Value</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.ResourceChange#getListChanges <em>List Changes</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.change.ChangePackage#getResourceChange()
* @model
diff --git a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/ChangeDescriptionImpl.java b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/ChangeDescriptionImpl.java
index 46ae6d64c..5a31a4f7e 100644
--- a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/ChangeDescriptionImpl.java
+++ b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/ChangeDescriptionImpl.java
@@ -57,13 +57,13 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.change.impl.ChangeDescriptionImpl#getObjectChanges <em>Object Changes</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.impl.ChangeDescriptionImpl#getObjectsToDetach <em>Objects To Detach</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.impl.ChangeDescriptionImpl#getObjectsToAttach <em>Objects To Attach</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.impl.ChangeDescriptionImpl#getResourceChanges <em>Resource Changes</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/EObjectToChangesMapEntryImpl.java b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/EObjectToChangesMapEntryImpl.java
index 5fe0c3938..6888624b3 100644
--- a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/EObjectToChangesMapEntryImpl.java
+++ b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/EObjectToChangesMapEntryImpl.java
@@ -35,11 +35,11 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.change.impl.EObjectToChangesMapEntryImpl#getTypedKey <em>Key</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.impl.EObjectToChangesMapEntryImpl#getTypedValue <em>Value</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/FeatureChangeImpl.java b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/FeatureChangeImpl.java
index 49eb5676c..491a0292c 100644
--- a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/FeatureChangeImpl.java
+++ b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/FeatureChangeImpl.java
@@ -49,6 +49,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.change.impl.FeatureChangeImpl#getFeatureName <em>Feature Name</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.impl.FeatureChangeImpl#getDataValue <em>Data Value</em>}</li>
@@ -58,7 +59,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <li>{@link org.eclipse.emf.ecore.change.impl.FeatureChangeImpl#getReferenceValue <em>Reference Value</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.impl.FeatureChangeImpl#getListChanges <em>List Changes</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/FeatureMapEntryImpl.java b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/FeatureMapEntryImpl.java
index 066533cf7..2f83e12c8 100644
--- a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/FeatureMapEntryImpl.java
+++ b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/FeatureMapEntryImpl.java
@@ -40,6 +40,7 @@ import org.eclipse.emf.ecore.util.FeatureMap;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.change.impl.FeatureMapEntryImpl#getFeatureName <em>Feature Name</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.impl.FeatureMapEntryImpl#getDataValue <em>Data Value</em>}</li>
@@ -47,7 +48,6 @@ import org.eclipse.emf.ecore.util.FeatureMap;
* <li>{@link org.eclipse.emf.ecore.change.impl.FeatureMapEntryImpl#getFeature <em>Feature</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.impl.FeatureMapEntryImpl#getReferenceValue <em>Reference Value</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/ListChangeImpl.java b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/ListChangeImpl.java
index 1bd881093..e71f3a377 100644
--- a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/ListChangeImpl.java
+++ b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/ListChangeImpl.java
@@ -49,6 +49,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.change.impl.ListChangeImpl#getKind <em>Kind</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.impl.ListChangeImpl#getDataValues <em>Data Values</em>}</li>
@@ -59,7 +60,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
* <li>{@link org.eclipse.emf.ecore.change.impl.ListChangeImpl#getFeature <em>Feature</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.impl.ListChangeImpl#getFeatureMapEntryValues <em>Feature Map Entry Values</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/ResourceChangeImpl.java b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/ResourceChangeImpl.java
index e849f0fd8..b7eb35d99 100644
--- a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/ResourceChangeImpl.java
+++ b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/ResourceChangeImpl.java
@@ -37,13 +37,13 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.change.impl.ResourceChangeImpl#getResourceURI <em>Resource URI</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.impl.ResourceChangeImpl#getResource <em>Resource</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.impl.ResourceChangeImpl#getValue <em>Value</em>}</li>
* <li>{@link org.eclipse.emf.ecore.change.impl.ResourceChangeImpl#getListChanges <em>List Changes</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/util/ChangeSwitch.java b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/util/ChangeSwitch.java
index 8709accc8..d6a66e462 100644
--- a/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/util/ChangeSwitch.java
+++ b/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/util/ChangeSwitch.java
@@ -60,7 +60,7 @@ public class ChangeSwitch<T> extends Switch<T>
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore.editor/src/org/eclipse/emf/ecore/presentation/EcoreEditor.java b/plugins/org.eclipse.emf.ecore.editor/src/org/eclipse/emf/ecore/presentation/EcoreEditor.java
index 00911655c..2acb6441a 100644
--- a/plugins/org.eclipse.emf.ecore.editor/src/org/eclipse/emf/ecore/presentation/EcoreEditor.java
+++ b/plugins/org.eclipse.emf.ecore.editor/src/org/eclipse/emf/ecore/presentation/EcoreEditor.java
@@ -1284,11 +1284,12 @@ public class EcoreEditor
*/
public Diagnostic analyzeResourceProblems(Resource resource, Exception exception)
{
- if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty())
+ boolean hasErrors = !resource.getErrors().isEmpty();
+ if (hasErrors || !resource.getWarnings().isEmpty())
{
BasicDiagnostic basicDiagnostic =
new BasicDiagnostic
- (Diagnostic.ERROR,
+ (hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
"org.eclipse.emf.ecore.editor",
0,
getString("_UI_CreateModelError_message", resource.getURI()),
@@ -1451,7 +1452,7 @@ public class EcoreEditor
* <!-- end-user-doc -->
* @generated NOT
*/
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public Object getAdapter(Class key)
{
diff --git a/plugins/org.eclipse.emf.ecore.xcore.ui/src/org/eclipse/emf/ecore/xcore/ui/AbstractSelectionView.java b/plugins/org.eclipse.emf.ecore.xcore.ui/src/org/eclipse/emf/ecore/xcore/ui/AbstractSelectionView.java
index ee12114c2..263c79589 100644
--- a/plugins/org.eclipse.emf.ecore.xcore.ui/src/org/eclipse/emf/ecore/xcore/ui/AbstractSelectionView.java
+++ b/plugins/org.eclipse.emf.ecore.xcore.ui/src/org/eclipse/emf/ecore/xcore/ui/AbstractSelectionView.java
@@ -98,7 +98,7 @@ public abstract class AbstractSelectionView extends ViewPart
// Ignore
}
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public Object getAdapter(Class type)
{
@@ -116,7 +116,6 @@ public abstract class AbstractSelectionView extends ViewPart
setEditingDomainProvider(getAdapter(part, IEditingDomainProvider.class));
}
- @SuppressWarnings("unchecked")
protected <T> T getAdapter(IWorkbenchPart part, Class<T> c)
{
IWorkbenchPage workbenchPage = getViewSite().getWorkbenchWindow().getActivePage();
diff --git a/plugins/org.eclipse.emf.ecore.xcore.ui/src/org/eclipse/emf/ecore/xcore/ui/contentassist/XcoreProposalProvider.java b/plugins/org.eclipse.emf.ecore.xcore.ui/src/org/eclipse/emf/ecore/xcore/ui/contentassist/XcoreProposalProvider.java
index 861056c6b..a2453b657 100644
--- a/plugins/org.eclipse.emf.ecore.xcore.ui/src/org/eclipse/emf/ecore/xcore/ui/contentassist/XcoreProposalProvider.java
+++ b/plugins/org.eclipse.emf.ecore.xcore.ui/src/org/eclipse/emf/ecore/xcore/ui/contentassist/XcoreProposalProvider.java
@@ -90,7 +90,7 @@ public class XcoreProposalProvider extends AbstractXcoreProposalProvider
@Override
public void accept(ICompletionProposal proposal)
{
- if (proposal instanceof ConfigurableCompletionProposal && textApplier != null)
+ if (proposal instanceof ConfigurableCompletionProposal)
{
((ConfigurableCompletionProposal)proposal).setTextApplier(textApplier);
}
@@ -118,7 +118,7 @@ public class XcoreProposalProvider extends AbstractXcoreProposalProvider
@Override
public void accept(ICompletionProposal proposal)
{
- if (proposal instanceof ConfigurableCompletionProposal && textApplier != null)
+ if (proposal instanceof ConfigurableCompletionProposal)
{
((ConfigurableCompletionProposal)proposal).setTextApplier(textApplier);
}
diff --git a/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/util/XcoreEcoreBuilder.java b/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/util/XcoreEcoreBuilder.java
index 9a217a641..3c126f53d 100644
--- a/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/util/XcoreEcoreBuilder.java
+++ b/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/util/XcoreEcoreBuilder.java
@@ -168,7 +168,6 @@ public class XcoreEcoreBuilder
int index = name.lastIndexOf(".");
if (index == -1)
{
- basePackage = null;
ePackage.setName(name);
}
else
diff --git a/plugins/org.eclipse.emf.ecore.xmi/src/org/eclipse/emf/ecore/xmi/impl/XMLResourceImpl.java b/plugins/org.eclipse.emf.ecore.xmi/src/org/eclipse/emf/ecore/xmi/impl/XMLResourceImpl.java
index c79d5fd0d..5192c8fca 100644
--- a/plugins/org.eclipse.emf.ecore.xmi/src/org/eclipse/emf/ecore/xmi/impl/XMLResourceImpl.java
+++ b/plugins/org.eclipse.emf.ecore.xmi/src/org/eclipse/emf/ecore/xmi/impl/XMLResourceImpl.java
@@ -336,7 +336,7 @@ public class XMLResourceImpl extends ResourceImpl implements XMLResource
uriHandler.setBaseURI(getURI());
}
BinaryResourceImpl.BinaryIO.Version version =
- options != null && options.containsKey(BinaryResourceImpl.OPTION_VERSION)? (Version)options.get(BinaryResourceImpl.OPTION_VERSION) : BinaryResourceImpl.BinaryIO.Version.VERSION_1_0;
+ options.containsKey(BinaryResourceImpl.OPTION_VERSION)? (Version)options.get(BinaryResourceImpl.OPTION_VERSION) : BinaryResourceImpl.BinaryIO.Version.VERSION_1_0;
EObjectOutputStream eObjectOutputStream = createEObjectOutputStream(outputStream, options, version, uriHandler);
eObjectOutputStream.saveResource(this);
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EAnnotation.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EAnnotation.java
index 5db1a1214..b6307fa0d 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EAnnotation.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EAnnotation.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.util.EMap;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.EAnnotation#getSource <em>Source</em>}</li>
* <li>{@link org.eclipse.emf.ecore.EAnnotation#getDetails <em>Details</em>}</li>
@@ -27,7 +28,6 @@ import org.eclipse.emf.common.util.EMap;
* <li>{@link org.eclipse.emf.ecore.EAnnotation#getContents <em>Contents</em>}</li>
* <li>{@link org.eclipse.emf.ecore.EAnnotation#getReferences <em>References</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.EcorePackage#getEAnnotation()
* @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='WellFormedSourceURI'"
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EAttribute.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EAttribute.java
index bd0a8fc0d..d9f271084 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EAttribute.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EAttribute.java
@@ -19,11 +19,11 @@ package org.eclipse.emf.ecore;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.EAttribute#isID <em>ID</em>}</li>
* <li>{@link org.eclipse.emf.ecore.EAttribute#getEAttributeType <em>EAttribute Type</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.EcorePackage#getEAttribute()
* @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='ConsistentTransient'"
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EClass.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EClass.java
index 40c62ed8e..26737cdf9 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EClass.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EClass.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.EClass#isAbstract <em>Abstract</em>}</li>
* <li>{@link org.eclipse.emf.ecore.EClass#isInterface <em>Interface</em>}</li>
@@ -40,7 +41,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
* <li>{@link org.eclipse.emf.ecore.EClass#getEGenericSuperTypes <em>EGeneric Super Types</em>}</li>
* <li>{@link org.eclipse.emf.ecore.EClass#getEAllGenericSuperTypes <em>EAll Generic Super Types</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.EcorePackage#getEClass()
* @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='InterfaceIsAbstract AtMostOneID UniqueFeatureNames UniqueOperationSignatures NoCircularSuperTypes WellFormedMapEntryClass ConsistentSuperTypes DisjointFeatureAndOperationSignatures'"
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EClassifier.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EClassifier.java
index 024fd2990..97f4f871b 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EClassifier.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EClassifier.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.EClassifier#getInstanceClassName <em>Instance Class Name</em>}</li>
* <li>{@link org.eclipse.emf.ecore.EClassifier#getInstanceClass <em>Instance Class</em>}</li>
@@ -28,7 +29,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link org.eclipse.emf.ecore.EClassifier#getEPackage <em>EPackage</em>}</li>
* <li>{@link org.eclipse.emf.ecore.EClassifier#getETypeParameters <em>EType Parameters</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.EcorePackage#getEClassifier()
* @model abstract="true"
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EDataType.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EDataType.java
index fa10726ad..e54bcde78 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EDataType.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EDataType.java
@@ -21,10 +21,10 @@ import java.util.Map;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.EDataType#isSerializable <em>Serializable</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.EcorePackage#getEDataType()
* @model
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EEnum.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EEnum.java
index 91d316937..dacce31bc 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EEnum.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EEnum.java
@@ -21,10 +21,10 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.EEnum#getELiterals <em>ELiterals</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.EcorePackage#getEEnum()
* @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='UniqueEnumeratorNames UniqueEnumeratorLiterals'"
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EEnumLiteral.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EEnumLiteral.java
index 4e8296199..3d5dd216b 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EEnumLiteral.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EEnumLiteral.java
@@ -22,13 +22,13 @@ import org.eclipse.emf.common.util.Enumerator;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.EEnumLiteral#getValue <em>Value</em>}</li>
* <li>{@link org.eclipse.emf.ecore.EEnumLiteral#getInstance <em>Instance</em>}</li>
* <li>{@link org.eclipse.emf.ecore.EEnumLiteral#getLiteral <em>Literal</em>}</li>
* <li>{@link org.eclipse.emf.ecore.EEnumLiteral#getEEnum <em>EEnum</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.EcorePackage#getEEnumLiteral()
* @model
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EFactory.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EFactory.java
index 5e349f8e1..82c568d95 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EFactory.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EFactory.java
@@ -22,10 +22,10 @@ package org.eclipse.emf.ecore;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.EFactory#getEPackage <em>EPackage</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.EcorePackage#getEFactory()
* @model
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EGenericType.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EGenericType.java
index ebf56ac8b..ec8020d1e 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EGenericType.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EGenericType.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.EGenericType#getEUpperBound <em>EUpper Bound</em>}</li>
* <li>{@link org.eclipse.emf.ecore.EGenericType#getETypeArguments <em>EType Arguments</em>}</li>
@@ -32,7 +33,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link org.eclipse.emf.ecore.EGenericType#getETypeParameter <em>EType Parameter</em>}</li>
* <li>{@link org.eclipse.emf.ecore.EGenericType#getEClassifier <em>EClassifier</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.EcorePackage#getEGenericType()
* @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='ConsistentType ConsistentBounds ConsistentArguments'"
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EModelElement.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EModelElement.java
index d2671a723..730e4e7a5 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EModelElement.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EModelElement.java
@@ -21,10 +21,10 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.EModelElement#getEAnnotations <em>EAnnotations</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.EcorePackage#getEModelElement()
* @model abstract="true"
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/ENamedElement.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/ENamedElement.java
index 60ee36cfc..5ccc60871 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/ENamedElement.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/ENamedElement.java
@@ -18,10 +18,10 @@ package org.eclipse.emf.ecore;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.ENamedElement#getName <em>Name</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.EcorePackage#getENamedElement()
* @model abstract="true"
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EOperation.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EOperation.java
index 6f0e010da..3d1275ff0 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EOperation.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EOperation.java
@@ -26,6 +26,7 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.EOperation#getEContainingClass <em>EContaining Class</em>}</li>
* <li>{@link org.eclipse.emf.ecore.EOperation#getETypeParameters <em>EType Parameters</em>}</li>
@@ -33,7 +34,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link org.eclipse.emf.ecore.EOperation#getEExceptions <em>EExceptions</em>}</li>
* <li>{@link org.eclipse.emf.ecore.EOperation#getEGenericExceptions <em>EGeneric Exceptions</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.EcorePackage#getEOperation()
* @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='UniqueParameterNames UniqueTypeParameterNames NoRepeatingVoid'"
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EPackage.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EPackage.java
index a75eef40b..a0d1e755e 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EPackage.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EPackage.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.EPackage#getNsURI <em>Ns URI</em>}</li>
* <li>{@link org.eclipse.emf.ecore.EPackage#getNsPrefix <em>Ns Prefix</em>}</li>
@@ -31,7 +32,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link org.eclipse.emf.ecore.EPackage#getESubpackages <em>ESubpackages</em>}</li>
* <li>{@link org.eclipse.emf.ecore.EPackage#getESuperPackage <em>ESuper Package</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.EcorePackage#getEPackage()
* @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='WellFormedNsURI WellFormedNsPrefix UniqueSubpackageNames UniqueClassifierNames UniqueNsURIs'"
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EParameter.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EParameter.java
index 954526528..6ba06e449 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EParameter.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EParameter.java
@@ -19,10 +19,10 @@ package org.eclipse.emf.ecore;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.EParameter#getEOperation <em>EOperation</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.EcorePackage#getEParameter()
* @model
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EReference.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EReference.java
index 487d9d31f..b39fa0b01 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EReference.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EReference.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.EReference#isContainment <em>Containment</em>}</li>
* <li>{@link org.eclipse.emf.ecore.EReference#isContainer <em>Container</em>}</li>
@@ -29,7 +30,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link org.eclipse.emf.ecore.EReference#getEReferenceType <em>EReference Type</em>}</li>
* <li>{@link org.eclipse.emf.ecore.EReference#getEKeys <em>EKeys</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.EcorePackage#getEReference()
* @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='ConsistentOpposite SingleContainer ConsistentKeys ConsistentUnique ConsistentContainer'"
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EStructuralFeature.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EStructuralFeature.java
index aa87b362f..cabc9c68e 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EStructuralFeature.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EStructuralFeature.java
@@ -25,6 +25,7 @@ import org.eclipse.emf.ecore.util.FeatureMap;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.EStructuralFeature#isChangeable <em>Changeable</em>}</li>
* <li>{@link org.eclipse.emf.ecore.EStructuralFeature#isVolatile <em>Volatile</em>}</li>
@@ -35,7 +36,6 @@ import org.eclipse.emf.ecore.util.FeatureMap;
* <li>{@link org.eclipse.emf.ecore.EStructuralFeature#isDerived <em>Derived</em>}</li>
* <li>{@link org.eclipse.emf.ecore.EStructuralFeature#getEContainingClass <em>EContaining Class</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.EcorePackage#getEStructuralFeature()
* @model abstract="true"
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/ETypeParameter.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/ETypeParameter.java
index 4904a4978..46518967c 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/ETypeParameter.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/ETypeParameter.java
@@ -20,10 +20,10 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.ETypeParameter#getEBounds <em>EBounds</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.EcorePackage#getETypeParameter()
* @model
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/ETypedElement.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/ETypedElement.java
index 73b9b1e9d..e96740c64 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/ETypedElement.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/ETypedElement.java
@@ -19,6 +19,7 @@ package org.eclipse.emf.ecore;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.ETypedElement#isOrdered <em>Ordered</em>}</li>
* <li>{@link org.eclipse.emf.ecore.ETypedElement#isUnique <em>Unique</em>}</li>
@@ -29,7 +30,6 @@ package org.eclipse.emf.ecore;
* <li>{@link org.eclipse.emf.ecore.ETypedElement#getEType <em>EType</em>}</li>
* <li>{@link org.eclipse.emf.ecore.ETypedElement#getEGenericType <em>EGeneric Type</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.EcorePackage#getETypedElement()
* @model abstract="true"
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EAnnotationImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EAnnotationImpl.java
index 794dea113..55bafa07f 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EAnnotationImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EAnnotationImpl.java
@@ -36,6 +36,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.impl.EAnnotationImpl#getSource <em>Source</em>}</li>
* <li>{@link org.eclipse.emf.ecore.impl.EAnnotationImpl#getDetails <em>Details</em>}</li>
@@ -43,7 +44,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <li>{@link org.eclipse.emf.ecore.impl.EAnnotationImpl#getContents <em>Contents</em>}</li>
* <li>{@link org.eclipse.emf.ecore.impl.EAnnotationImpl#getReferences <em>References</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EAttributeImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EAttributeImpl.java
index 720718819..c85f57114 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EAttributeImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EAttributeImpl.java
@@ -33,11 +33,11 @@ import org.eclipse.emf.ecore.util.FeatureMapUtil;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.impl.EAttributeImpl#isID <em>ID</em>}</li>
* <li>{@link org.eclipse.emf.ecore.impl.EAttributeImpl#getEAttributeType <em>EAttribute Type</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EClassImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EClassImpl.java
index 00babf57e..d32370607 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EClassImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EClassImpl.java
@@ -62,6 +62,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.impl.EClassImpl#isAbstract <em>Abstract</em>}</li>
* <li>{@link org.eclipse.emf.ecore.impl.EClassImpl#isInterface <em>Interface</em>}</li>
@@ -80,7 +81,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <li>{@link org.eclipse.emf.ecore.impl.EClassImpl#getEGenericSuperTypes <em>EGeneric Super Types</em>}</li>
* <li>{@link org.eclipse.emf.ecore.impl.EClassImpl#getEAllGenericSuperTypes <em>EAll Generic Super Types</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EClassifierImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EClassifierImpl.java
index 15d87572f..d9e667772 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EClassifierImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EClassifierImpl.java
@@ -37,6 +37,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.impl.EClassifierImpl#getInstanceClassName <em>Instance Class Name</em>}</li>
* <li>{@link org.eclipse.emf.ecore.impl.EClassifierImpl#getInstanceClass <em>Instance Class</em>}</li>
@@ -45,7 +46,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <li>{@link org.eclipse.emf.ecore.impl.EClassifierImpl#getEPackage <em>EPackage</em>}</li>
* <li>{@link org.eclipse.emf.ecore.impl.EClassifierImpl#getETypeParameters <em>EType Parameters</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EDataTypeImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EDataTypeImpl.java
index 0f2df33d3..d8b2ed9b1 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EDataTypeImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EDataTypeImpl.java
@@ -32,10 +32,10 @@ import org.eclipse.emf.ecore.util.ExtendedMetaData;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.impl.EDataTypeImpl#isSerializable <em>Serializable</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EEnumImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EEnumImpl.java
index 05ecbfabe..a69dfbcc9 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EEnumImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EEnumImpl.java
@@ -33,10 +33,10 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.impl.EEnumImpl#getELiterals <em>ELiterals</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EEnumLiteralImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EEnumLiteralImpl.java
index 5c4987830..8fd534d9e 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EEnumLiteralImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EEnumLiteralImpl.java
@@ -31,13 +31,13 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.impl.EEnumLiteralImpl#getValue <em>Value</em>}</li>
* <li>{@link org.eclipse.emf.ecore.impl.EEnumLiteralImpl#getInstance <em>Instance</em>}</li>
* <li>{@link org.eclipse.emf.ecore.impl.EEnumLiteralImpl#getLiteral <em>Literal</em>}</li>
* <li>{@link org.eclipse.emf.ecore.impl.EEnumLiteralImpl#getEEnum <em>EEnum</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EFactoryImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EFactoryImpl.java
index 9dd3e7e17..7a7b5c7ce 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EFactoryImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EFactoryImpl.java
@@ -55,10 +55,10 @@ import org.eclipse.emf.ecore.resource.impl.BinaryResourceImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.impl.EFactoryImpl#getEPackage <em>EPackage</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/ENamedElementImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/ENamedElementImpl.java
index d42237dbd..a3bc2a95c 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/ENamedElementImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/ENamedElementImpl.java
@@ -32,10 +32,10 @@ import org.eclipse.emf.ecore.util.ECrossReferenceEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.impl.ENamedElementImpl#getName <em>Name</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EOperationImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EOperationImpl.java
index 1d5b1d75f..7898065eb 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EOperationImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EOperationImpl.java
@@ -50,6 +50,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.impl.EOperationImpl#getEContainingClass <em>EContaining Class</em>}</li>
* <li>{@link org.eclipse.emf.ecore.impl.EOperationImpl#getETypeParameters <em>EType Parameters</em>}</li>
@@ -57,7 +58,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <li>{@link org.eclipse.emf.ecore.impl.EOperationImpl#getEExceptions <em>EExceptions</em>}</li>
* <li>{@link org.eclipse.emf.ecore.impl.EOperationImpl#getEGenericExceptions <em>EGeneric Exceptions</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EPackageImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EPackageImpl.java
index d0bddd26c..97ac5786c 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EPackageImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EPackageImpl.java
@@ -62,6 +62,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.impl.EPackageImpl#getNsURI <em>Ns URI</em>}</li>
* <li>{@link org.eclipse.emf.ecore.impl.EPackageImpl#getNsPrefix <em>Ns Prefix</em>}</li>
@@ -70,7 +71,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <li>{@link org.eclipse.emf.ecore.impl.EPackageImpl#getESubpackages <em>ESubpackages</em>}</li>
* <li>{@link org.eclipse.emf.ecore.impl.EPackageImpl#getESuperPackage <em>ESuper Package</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EParameterImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EParameterImpl.java
index 582a74116..1bf8d0fbd 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EParameterImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EParameterImpl.java
@@ -26,10 +26,10 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.impl.EParameterImpl#getEOperation <em>EOperation</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EReferenceImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EReferenceImpl.java
index 2a1b86c52..0969dcada 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EReferenceImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EReferenceImpl.java
@@ -33,6 +33,7 @@ import org.eclipse.emf.ecore.util.EObjectResolvingEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.impl.EReferenceImpl#isContainment <em>Containment</em>}</li>
* <li>{@link org.eclipse.emf.ecore.impl.EReferenceImpl#isContainer <em>Container</em>}</li>
@@ -41,7 +42,6 @@ import org.eclipse.emf.ecore.util.EObjectResolvingEList;
* <li>{@link org.eclipse.emf.ecore.impl.EReferenceImpl#getEReferenceType <em>EReference Type</em>}</li>
* <li>{@link org.eclipse.emf.ecore.impl.EReferenceImpl#getEKeys <em>EKeys</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EStructuralFeatureImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EStructuralFeatureImpl.java
index 3e8bdf1b0..b81593513 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EStructuralFeatureImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EStructuralFeatureImpl.java
@@ -60,6 +60,7 @@ import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.impl.EStructuralFeatureImpl#isChangeable <em>Changeable</em>}</li>
* <li>{@link org.eclipse.emf.ecore.impl.EStructuralFeatureImpl#isVolatile <em>Volatile</em>}</li>
@@ -70,7 +71,6 @@ import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
* <li>{@link org.eclipse.emf.ecore.impl.EStructuralFeatureImpl#isDerived <em>Derived</em>}</li>
* <li>{@link org.eclipse.emf.ecore.impl.EStructuralFeatureImpl#getEContainingClass <em>EContaining Class</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/ETypeParameterImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/ETypeParameterImpl.java
index d72fc1021..02c2c07e6 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/ETypeParameterImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/ETypeParameterImpl.java
@@ -37,10 +37,10 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.impl.ETypeParameterImpl#getEBounds <em>EBounds</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/ETypedElementImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/ETypedElementImpl.java
index 1a600efd4..0490392e9 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/ETypedElementImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/ETypedElementImpl.java
@@ -32,6 +32,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.impl.ETypedElementImpl#isOrdered <em>Ordered</em>}</li>
* <li>{@link org.eclipse.emf.ecore.impl.ETypedElementImpl#isUnique <em>Unique</em>}</li>
@@ -42,7 +43,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <li>{@link org.eclipse.emf.ecore.impl.ETypedElementImpl#getEType <em>EType</em>}</li>
* <li>{@link org.eclipse.emf.ecore.impl.ETypedElementImpl#getEGenericType <em>EGeneric Type</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/resource/impl/URIHandlerImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/resource/impl/URIHandlerImpl.java
index 55214b98e..6953adf28 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/resource/impl/URIHandlerImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/resource/impl/URIHandlerImpl.java
@@ -266,7 +266,8 @@ public class URIHandlerImpl implements URIHandler
/**
* This implementation delegates to the {@link #getURIConverter(Map) URI converter}'s {@link URIConverter#getContentHandlers() content handlers}.
*/
- public Map<String, ?> contentDescription(URI uri, Map<?, ?> options) throws IOException
+ @SuppressWarnings("null")
+public Map<String, ?> contentDescription(URI uri, Map<?, ?> options) throws IOException
{
URIConverter uriConverter = (URIConverter)options.get(URIConverter.OPTION_URI_CONVERTER);
InputStream inputStream = null;
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/EcoreSwitch.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/EcoreSwitch.java
index 64a9c07a2..1f78f9c4e 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/EcoreSwitch.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/EcoreSwitch.java
@@ -59,7 +59,7 @@ public class EcoreSwitch<T> extends Switch<T>
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/SpaceType.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/SpaceType.java
index b5575887b..9f4de683c 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/SpaceType.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/SpaceType.java
@@ -94,6 +94,8 @@ public enum SpaceType implements Enumerator
* Returns the '<em><b>Space Type</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 SpaceType get(String literal)
@@ -113,6 +115,8 @@ public enum SpaceType implements Enumerator
* Returns the '<em><b>Space Type</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 SpaceType getByName(String name)
@@ -132,6 +136,8 @@ public enum SpaceType implements Enumerator
* Returns the '<em><b>Space Type</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 SpaceType get(int value)
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/XMLNamespaceDocumentRoot.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/XMLNamespaceDocumentRoot.java
index 658a57e8f..afeecf9ec 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/XMLNamespaceDocumentRoot.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/XMLNamespaceDocumentRoot.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.util.FeatureMap;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.xml.namespace.XMLNamespaceDocumentRoot#getMixed <em>Mixed</em>}</li>
* <li>{@link org.eclipse.emf.ecore.xml.namespace.XMLNamespaceDocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
@@ -32,7 +33,6 @@ import org.eclipse.emf.ecore.util.FeatureMap;
* <li>{@link org.eclipse.emf.ecore.xml.namespace.XMLNamespaceDocumentRoot#getLang <em>Lang</em>}</li>
* <li>{@link org.eclipse.emf.ecore.xml.namespace.XMLNamespaceDocumentRoot#getSpace <em>Space</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.xml.namespace.XMLNamespacePackage#getXMLNamespaceDocumentRoot()
* @model extendedMetaData="name='' kind='mixed'"
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/impl/XMLNamespaceDocumentRootImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/impl/XMLNamespaceDocumentRootImpl.java
index 1f0791055..37d0206cd 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/impl/XMLNamespaceDocumentRootImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/impl/XMLNamespaceDocumentRootImpl.java
@@ -36,6 +36,7 @@ import org.eclipse.emf.ecore.xml.namespace.XMLNamespacePackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.xml.namespace.impl.XMLNamespaceDocumentRootImpl#getMixed <em>Mixed</em>}</li>
* <li>{@link org.eclipse.emf.ecore.xml.namespace.impl.XMLNamespaceDocumentRootImpl#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
@@ -45,7 +46,6 @@ import org.eclipse.emf.ecore.xml.namespace.XMLNamespacePackage;
* <li>{@link org.eclipse.emf.ecore.xml.namespace.impl.XMLNamespaceDocumentRootImpl#getLang <em>Lang</em>}</li>
* <li>{@link org.eclipse.emf.ecore.xml.namespace.impl.XMLNamespaceDocumentRootImpl#getSpace <em>Space</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/impl/XMLNamespaceFactoryImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/impl/XMLNamespaceFactoryImpl.java
index 756a6b081..617a310cb 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/impl/XMLNamespaceFactoryImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/impl/XMLNamespaceFactoryImpl.java
@@ -43,7 +43,7 @@ public class XMLNamespaceFactoryImpl extends EFactoryImpl implements XMLNamespac
{
try
{
- XMLNamespaceFactory theXMLNamespaceFactory = (XMLNamespaceFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.w3.org/XML/1998/namespace");
+ XMLNamespaceFactory theXMLNamespaceFactory = (XMLNamespaceFactory)EPackage.Registry.INSTANCE.getEFactory(XMLNamespacePackage.eNS_URI);
if (theXMLNamespaceFactory != null)
{
return theXMLNamespaceFactory;
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/impl/XMLNamespacePackageImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/impl/XMLNamespacePackageImpl.java
index 5300fbd3f..026838240 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/impl/XMLNamespacePackageImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/impl/XMLNamespacePackageImpl.java
@@ -386,14 +386,14 @@ public class XMLNamespacePackageImpl extends EPackageImpl implements XMLNamespac
*/
protected void createNamespaceAnnotations()
{
- String source = "http://www.w3.org/XML/1998/namespace";
+ String source = "http://www.w3.org/XML/1998/namespace";
addAnnotation
(this,
source,
new String[]
{
"lang", "en"
- });
+ });
}
/**
@@ -404,7 +404,7 @@ public class XMLNamespacePackageImpl extends EPackageImpl implements XMLNamespac
*/
protected void createExtendedMetaDataAnnotations()
{
- String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
+ String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
addAnnotation
(langTypeEDataType,
source,
@@ -412,7 +412,7 @@ public class XMLNamespacePackageImpl extends EPackageImpl implements XMLNamespac
{
"name", "lang_._type",
"memberTypes", "http://www.eclipse.org/emf/2003/XMLType#language lang_._type_._member_._1"
- });
+ });
addAnnotation
(langTypeNullEDataType,
source,
@@ -421,14 +421,14 @@ public class XMLNamespacePackageImpl extends EPackageImpl implements XMLNamespac
"name", "lang_._type_._member_._1",
"baseType", "http://www.eclipse.org/emf/2003/XMLType#string",
"enumeration", ""
- });
+ });
addAnnotation
(spaceTypeEEnum,
source,
new String[]
{
"name", "space_._type"
- });
+ });
addAnnotation
(spaceTypeObjectEDataType,
source,
@@ -436,7 +436,7 @@ public class XMLNamespacePackageImpl extends EPackageImpl implements XMLNamespac
{
"name", "space_._type:Object",
"baseType", "space_._type"
- });
+ });
addAnnotation
(xmlNamespaceDocumentRootEClass,
source,
@@ -444,7 +444,7 @@ public class XMLNamespacePackageImpl extends EPackageImpl implements XMLNamespac
{
"name", "",
"kind", "mixed"
- });
+ });
addAnnotation
(getXMLNamespaceDocumentRoot_Mixed(),
source,
@@ -452,7 +452,7 @@ public class XMLNamespacePackageImpl extends EPackageImpl implements XMLNamespac
{
"kind", "elementWildcard",
"name", ":mixed"
- });
+ });
addAnnotation
(getXMLNamespaceDocumentRoot_XMLNSPrefixMap(),
source,
@@ -460,7 +460,7 @@ public class XMLNamespacePackageImpl extends EPackageImpl implements XMLNamespac
{
"kind", "attribute",
"name", "xmlns:prefix"
- });
+ });
addAnnotation
(getXMLNamespaceDocumentRoot_XSISchemaLocation(),
source,
@@ -468,7 +468,7 @@ public class XMLNamespacePackageImpl extends EPackageImpl implements XMLNamespac
{
"kind", "attribute",
"name", "xsi:schemaLocation"
- });
+ });
addAnnotation
(getXMLNamespaceDocumentRoot_Base(),
source,
@@ -477,7 +477,7 @@ public class XMLNamespacePackageImpl extends EPackageImpl implements XMLNamespac
"kind", "attribute",
"name", "base",
"namespace", "##targetNamespace"
- });
+ });
addAnnotation
(getXMLNamespaceDocumentRoot_Id(),
source,
@@ -486,7 +486,7 @@ public class XMLNamespacePackageImpl extends EPackageImpl implements XMLNamespac
"kind", "attribute",
"name", "id",
"namespace", "##targetNamespace"
- });
+ });
addAnnotation
(getXMLNamespaceDocumentRoot_Lang(),
source,
@@ -495,7 +495,7 @@ public class XMLNamespacePackageImpl extends EPackageImpl implements XMLNamespac
"kind", "attribute",
"name", "lang",
"namespace", "##targetNamespace"
- });
+ });
addAnnotation
(getXMLNamespaceDocumentRoot_Space(),
source,
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/AnyType.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/AnyType.java
index 87a2a09b6..ee340b697 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/AnyType.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/AnyType.java
@@ -22,12 +22,12 @@ import org.eclipse.emf.ecore.util.FeatureMap;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.xml.type.AnyType#getMixed <em>Mixed</em>}</li>
* <li>{@link org.eclipse.emf.ecore.xml.type.AnyType#getAny <em>Any</em>}</li>
* <li>{@link org.eclipse.emf.ecore.xml.type.AnyType#getAnyAttribute <em>Any Attribute</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.xml.type.XMLTypePackage#getAnyType()
* @model extendedMetaData="name='anyType' kind='mixed'"
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/ProcessingInstruction.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/ProcessingInstruction.java
index 9c98e4c9d..2ebb4590c 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/ProcessingInstruction.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/ProcessingInstruction.java
@@ -19,11 +19,11 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.xml.type.ProcessingInstruction#getData <em>Data</em>}</li>
* <li>{@link org.eclipse.emf.ecore.xml.type.ProcessingInstruction#getTarget <em>Target</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.xml.type.XMLTypePackage#getProcessingInstruction()
* @model extendedMetaData="name='processingInstruction_._type' kind='empty'"
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/SimpleAnyType.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/SimpleAnyType.java
index a9e4e6cab..71ceb3288 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/SimpleAnyType.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/SimpleAnyType.java
@@ -21,12 +21,12 @@ import org.eclipse.emf.ecore.EDataType;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.xml.type.SimpleAnyType#getRawValue <em>Raw Value</em>}</li>
* <li>{@link org.eclipse.emf.ecore.xml.type.SimpleAnyType#getValue <em>Value</em>}</li>
* <li>{@link org.eclipse.emf.ecore.xml.type.SimpleAnyType#getInstanceType <em>Instance Type</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.xml.type.XMLTypePackage#getSimpleAnyType()
* @model extendedMetaData="name='simpleAnyType' kind='simple'"
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/XMLTypeDocumentRoot.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/XMLTypeDocumentRoot.java
index 2bedf4586..7c1380dfe 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/XMLTypeDocumentRoot.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/XMLTypeDocumentRoot.java
@@ -23,12 +23,12 @@ import org.eclipse.emf.ecore.util.FeatureMap;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.xml.type.XMLTypeDocumentRoot#getMixed <em>Mixed</em>}</li>
* <li>{@link org.eclipse.emf.ecore.xml.type.XMLTypeDocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
* <li>{@link org.eclipse.emf.ecore.xml.type.XMLTypeDocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.ecore.xml.type.XMLTypePackage#getXMLTypeDocumentRoot()
* @model features="cDATA comment processingInstruction text"
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/AnyTypeImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/AnyTypeImpl.java
index e881cb913..0cec710d0 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/AnyTypeImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/AnyTypeImpl.java
@@ -26,12 +26,12 @@ import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.xml.type.impl.AnyTypeImpl#getMixed <em>Mixed</em>}</li>
* <li>{@link org.eclipse.emf.ecore.xml.type.impl.AnyTypeImpl#getAny <em>Any</em>}</li>
* <li>{@link org.eclipse.emf.ecore.xml.type.impl.AnyTypeImpl#getAnyAttribute <em>Any Attribute</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/ProcessingInstructionImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/ProcessingInstructionImpl.java
index 863b028e0..f5bb56be0 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/ProcessingInstructionImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/ProcessingInstructionImpl.java
@@ -26,11 +26,11 @@ import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.xml.type.impl.ProcessingInstructionImpl#getData <em>Data</em>}</li>
* <li>{@link org.eclipse.emf.ecore.xml.type.impl.ProcessingInstructionImpl#getTarget <em>Target</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/SimpleAnyTypeImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/SimpleAnyTypeImpl.java
index 11c002318..e8f1f96b0 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/SimpleAnyTypeImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/SimpleAnyTypeImpl.java
@@ -25,12 +25,12 @@ import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.xml.type.impl.SimpleAnyTypeImpl#getRawValue <em>Raw Value</em>}</li>
* <li>{@link org.eclipse.emf.ecore.xml.type.impl.SimpleAnyTypeImpl#getValue <em>Value</em>}</li>
* <li>{@link org.eclipse.emf.ecore.xml.type.impl.SimpleAnyTypeImpl#getInstanceType <em>Instance Type</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/XMLTypeDocumentRootImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/XMLTypeDocumentRootImpl.java
index 859bbabe6..e0303122b 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/XMLTypeDocumentRootImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/XMLTypeDocumentRootImpl.java
@@ -36,6 +36,7 @@ import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.ecore.xml.type.impl.XMLTypeDocumentRootImpl#getMixed <em>Mixed</em>}</li>
* <li>{@link org.eclipse.emf.ecore.xml.type.impl.XMLTypeDocumentRootImpl#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
@@ -45,7 +46,6 @@ import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
* <li>{@link org.eclipse.emf.ecore.xml.type.impl.XMLTypeDocumentRootImpl#getProcessingInstruction <em>Processing Instruction</em>}</li>
* <li>{@link org.eclipse.emf.ecore.xml.type.impl.XMLTypeDocumentRootImpl#getText <em>Text</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/XMLTypeFactoryImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/XMLTypeFactoryImpl.java
index f30ae7db3..9d593c7fb 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/XMLTypeFactoryImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/XMLTypeFactoryImpl.java
@@ -1749,7 +1749,7 @@ public class XMLTypeFactoryImpl extends EFactoryImpl implements XMLTypeFactory
{
try
{
- XMLTypeFactory theXMLTypeFactory = (XMLTypeFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/2003/XMLType");
+ XMLTypeFactory theXMLTypeFactory = (XMLTypeFactory)EPackage.Registry.INSTANCE.getEFactory(XMLTypePackage.eNS_URI);
if (theXMLTypeFactory != null)
{
return theXMLTypeFactory;
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/XMLTypePackageImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/XMLTypePackageImpl.java
index b27656722..f03c2ebbb 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/XMLTypePackageImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/XMLTypePackageImpl.java
@@ -1567,14 +1567,14 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
*/
protected void createExtendedMetaDataAnnotations()
{
- String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
+ String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
addAnnotation
(anySimpleTypeEDataType,
source,
new String[]
{
"name", "anySimpleType"
- });
+ });
addAnnotation
(anyTypeEClass,
source,
@@ -1582,7 +1582,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "anyType",
"kind", "mixed"
- });
+ });
addAnnotation
(getAnyType_Mixed(),
source,
@@ -1590,7 +1590,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"kind", "elementWildcard",
"name", ":mixed"
- });
+ });
addAnnotation
(getAnyType_Any(),
source,
@@ -1600,7 +1600,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
"wildcards", "##any",
"name", ":1",
"processing", "lax"
- });
+ });
addAnnotation
(getAnyType_AnyAttribute(),
source,
@@ -1610,7 +1610,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
"wildcards", "##any",
"name", ":2",
"processing", "lax"
- });
+ });
addAnnotation
(anyURIEDataType,
source,
@@ -1618,7 +1618,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "anyURI",
"whiteSpace", "collapse"
- });
+ });
addAnnotation
(base64BinaryEDataType,
source,
@@ -1626,7 +1626,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "base64Binary",
"whiteSpace", "collapse"
- });
+ });
addAnnotation
(booleanEDataType,
source,
@@ -1634,7 +1634,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "boolean",
"whiteSpace", "collapse"
- });
+ });
addAnnotation
(booleanObjectEDataType,
source,
@@ -1642,14 +1642,14 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "boolean:Object",
"baseType", "boolean"
- });
+ });
addAnnotation
(byteEDataType,
source,
new String[]
{
"name", "byte"
- });
+ });
addAnnotation
(byteObjectEDataType,
source,
@@ -1657,7 +1657,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "byte:Object",
"baseType", "byte"
- });
+ });
addAnnotation
(dateEDataType,
source,
@@ -1665,7 +1665,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "date",
"whiteSpace", "collapse"
- });
+ });
addAnnotation
(dateTimeEDataType,
source,
@@ -1673,7 +1673,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "dateTime",
"whiteSpace", "collapse"
- });
+ });
addAnnotation
(decimalEDataType,
source,
@@ -1681,7 +1681,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "decimal",
"whiteSpace", "collapse"
- });
+ });
addAnnotation
(doubleEDataType,
source,
@@ -1689,7 +1689,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "double",
"whiteSpace", "collapse"
- });
+ });
addAnnotation
(doubleObjectEDataType,
source,
@@ -1697,7 +1697,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "double:Object",
"baseType", "double"
- });
+ });
addAnnotation
(durationEDataType,
source,
@@ -1705,7 +1705,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "duration",
"whiteSpace", "collapse"
- });
+ });
addAnnotation
(entitiesEDataType,
source,
@@ -1714,7 +1714,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
"name", "ENTITIES",
"baseType", "ENTITIES_._base",
"minLength", "1"
- });
+ });
addAnnotation
(entitiesBaseEDataType,
source,
@@ -1722,7 +1722,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "ENTITIES_._base",
"itemType", "ENTITY"
- });
+ });
addAnnotation
(entityEDataType,
source,
@@ -1730,7 +1730,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "ENTITY",
"baseType", "NCName"
- });
+ });
addAnnotation
(floatEDataType,
source,
@@ -1738,7 +1738,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "float",
"whiteSpace", "collapse"
- });
+ });
addAnnotation
(floatObjectEDataType,
source,
@@ -1746,7 +1746,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "float:Object",
"baseType", "float"
- });
+ });
addAnnotation
(gDayEDataType,
source,
@@ -1754,7 +1754,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "gDay",
"whiteSpace", "collapse"
- });
+ });
addAnnotation
(gMonthEDataType,
source,
@@ -1762,7 +1762,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "gMonth",
"whiteSpace", "collapse"
- });
+ });
addAnnotation
(gMonthDayEDataType,
source,
@@ -1770,7 +1770,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "gMonthDay",
"whiteSpace", "collapse"
- });
+ });
addAnnotation
(gYearEDataType,
source,
@@ -1778,7 +1778,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "gYear",
"whiteSpace", "collapse"
- });
+ });
addAnnotation
(gYearMonthEDataType,
source,
@@ -1786,7 +1786,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "gYearMonth",
"whiteSpace", "collapse"
- });
+ });
addAnnotation
(hexBinaryEDataType,
source,
@@ -1794,7 +1794,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "hexBinary",
"whiteSpace", "collapse"
- });
+ });
addAnnotation
(idEDataType,
source,
@@ -1802,7 +1802,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "ID",
"baseType", "NCName"
- });
+ });
addAnnotation
(idrefEDataType,
source,
@@ -1810,7 +1810,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "IDREF",
"baseType", "NCName"
- });
+ });
addAnnotation
(idrefsEDataType,
source,
@@ -1819,7 +1819,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
"name", "IDREFS",
"baseType", "IDREFS_._base",
"minLength", "1"
- });
+ });
addAnnotation
(idrefsBaseEDataType,
source,
@@ -1827,21 +1827,21 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "IDREFS_._base",
"itemType", "IDREF"
- });
+ });
addAnnotation
(intEDataType,
source,
new String[]
{
"name", "int"
- });
+ });
addAnnotation
(integerEDataType,
source,
new String[]
{
"name", "integer"
- });
+ });
addAnnotation
(intObjectEDataType,
source,
@@ -1849,7 +1849,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "int:Object",
"baseType", "int"
- });
+ });
addAnnotation
(languageEDataType,
source,
@@ -1858,14 +1858,14 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
"name", "language",
"baseType", "token",
"pattern", "[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*"
- });
+ });
addAnnotation
(longEDataType,
source,
new String[]
{
"name", "long"
- });
+ });
addAnnotation
(longObjectEDataType,
source,
@@ -1873,7 +1873,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "long:Object",
"baseType", "long"
- });
+ });
addAnnotation
(nameEDataType,
source,
@@ -1882,7 +1882,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
"name", "Name",
"baseType", "token",
"pattern", "\\i\\c*"
- });
+ });
addAnnotation
(ncNameEDataType,
source,
@@ -1891,7 +1891,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
"name", "NCName",
"baseType", "Name",
"pattern", "[\\i-[:]][\\c-[:]]*"
- });
+ });
addAnnotation
(negativeIntegerEDataType,
source,
@@ -1900,7 +1900,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
"name", "negativeInteger",
"baseType", "nonPositiveInteger",
"maxInclusive", "-1"
- });
+ });
addAnnotation
(nmtokenEDataType,
source,
@@ -1909,7 +1909,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
"name", "NMTOKEN",
"baseType", "token",
"pattern", "\\c+"
- });
+ });
addAnnotation
(nmtokensEDataType,
source,
@@ -1918,7 +1918,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
"name", "NMTOKENS",
"baseType", "NMTOKENS_._base",
"minLength", "1"
- });
+ });
addAnnotation
(nmtokensBaseEDataType,
source,
@@ -1926,7 +1926,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "NMTOKENS_._base",
"itemType", "NMTOKEN"
- });
+ });
addAnnotation
(nonNegativeIntegerEDataType,
source,
@@ -1935,7 +1935,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
"name", "nonNegativeInteger",
"baseType", "integer",
"minInclusive", "0"
- });
+ });
addAnnotation
(nonPositiveIntegerEDataType,
source,
@@ -1944,7 +1944,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
"name", "nonPositiveInteger",
"baseType", "integer",
"maxInclusive", "0"
- });
+ });
addAnnotation
(normalizedStringEDataType,
source,
@@ -1953,7 +1953,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
"name", "normalizedString",
"baseType", "string",
"whiteSpace", "replace"
- });
+ });
addAnnotation
(notationEDataType,
source,
@@ -1961,7 +1961,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "NOTATION",
"whiteSpace", "collapse"
- });
+ });
addAnnotation
(positiveIntegerEDataType,
source,
@@ -1970,7 +1970,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
"name", "positiveInteger",
"baseType", "nonNegativeInteger",
"minInclusive", "1"
- });
+ });
addAnnotation
(processingInstructionEClass,
source,
@@ -1978,7 +1978,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "processingInstruction_._type",
"kind", "empty"
- });
+ });
addAnnotation
(getProcessingInstruction_Data(),
source,
@@ -1986,7 +1986,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"kind", "attribute",
"name", "data"
- });
+ });
addAnnotation
(getProcessingInstruction_Target(),
source,
@@ -1994,7 +1994,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"kind", "attribute",
"name", "target"
- });
+ });
addAnnotation
(qNameEDataType,
source,
@@ -2002,14 +2002,14 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "QName",
"whiteSpace", "collapse"
- });
+ });
addAnnotation
(shortEDataType,
source,
new String[]
{
"name", "short"
- });
+ });
addAnnotation
(shortObjectEDataType,
source,
@@ -2017,7 +2017,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "short:Object",
"baseType", "short"
- });
+ });
addAnnotation
(simpleAnyTypeEClass,
source,
@@ -2025,7 +2025,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "simpleAnyType",
"kind", "simple"
- });
+ });
addAnnotation
(getSimpleAnyType_RawValue(),
source,
@@ -2033,7 +2033,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", ":3",
"kind", "simple"
- });
+ });
addAnnotation
(getSimpleAnyType_Value(),
source,
@@ -2041,7 +2041,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", ":4",
"kind", "simple"
- });
+ });
addAnnotation
(getSimpleAnyType_InstanceType(),
source,
@@ -2049,7 +2049,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", ":5",
"kind", "simple"
- });
+ });
addAnnotation
(stringEDataType,
source,
@@ -2057,7 +2057,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "string",
"whiteSpace", "preserve"
- });
+ });
addAnnotation
(timeEDataType,
source,
@@ -2065,7 +2065,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "time",
"whiteSpace", "collapse"
- });
+ });
addAnnotation
(tokenEDataType,
source,
@@ -2074,7 +2074,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
"name", "token",
"baseType", "normalizedString",
"whiteSpace", "collapse"
- });
+ });
addAnnotation
(unsignedByteEDataType,
source,
@@ -2083,7 +2083,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
"name", "unsignedByte",
"maxInclusive", "255",
"minInclusive", "0"
- });
+ });
addAnnotation
(unsignedByteObjectEDataType,
source,
@@ -2091,7 +2091,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "unsignedByte:Object",
"baseType", "unsignedByte"
- });
+ });
addAnnotation
(unsignedIntEDataType,
source,
@@ -2100,7 +2100,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
"name", "unsignedInt",
"maxInclusive", "4294967295",
"minInclusive", "0"
- });
+ });
addAnnotation
(unsignedIntObjectEDataType,
source,
@@ -2108,7 +2108,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "unsignedInt:Object",
"baseType", "unsignedInt"
- });
+ });
addAnnotation
(unsignedLongEDataType,
source,
@@ -2118,7 +2118,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
"baseType", "nonNegativeInteger",
"maxInclusive", "18446744073709551615",
"minInclusive", "0"
- });
+ });
addAnnotation
(unsignedShortEDataType,
source,
@@ -2127,7 +2127,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
"name", "unsignedShort",
"maxInclusive", "65535",
"minInclusive", "0"
- });
+ });
addAnnotation
(unsignedShortObjectEDataType,
source,
@@ -2135,7 +2135,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "unsignedShort:Object",
"baseType", "unsignedShort"
- });
+ });
addAnnotation
(xmlTypeDocumentRootEClass,
source,
@@ -2143,7 +2143,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"name", "",
"kind", "mixed"
- });
+ });
addAnnotation
(getXMLTypeDocumentRoot_Mixed(),
source,
@@ -2151,7 +2151,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"kind", "elementWildcard",
"name", ":mixed"
- });
+ });
addAnnotation
(getXMLTypeDocumentRoot_XMLNSPrefixMap(),
source,
@@ -2159,7 +2159,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"kind", "attribute",
"name", "xmlns:prefix"
- });
+ });
addAnnotation
(getXMLTypeDocumentRoot_XSISchemaLocation(),
source,
@@ -2167,7 +2167,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
{
"kind", "attribute",
"name", "xsi:schemaLocation"
- });
+ });
addAnnotation
(getXMLTypeDocumentRoot_CDATA(),
source,
@@ -2176,7 +2176,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
"kind", "element",
"name", "cDATA",
"namespace", "##targetNamespace"
- });
+ });
addAnnotation
(getXMLTypeDocumentRoot_Comment(),
source,
@@ -2185,7 +2185,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
"kind", "element",
"name", "comment",
"namespace", "##targetNamespace"
- });
+ });
addAnnotation
(getXMLTypeDocumentRoot_ProcessingInstruction(),
source,
@@ -2194,7 +2194,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
"kind", "element",
"name", "processingInstruction",
"namespace", "##targetNamespace"
- });
+ });
addAnnotation
(getXMLTypeDocumentRoot_Text(),
source,
@@ -2203,7 +2203,7 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
"kind", "element",
"name", "text",
"namespace", "##targetNamespace"
- });
+ });
}
/**
diff --git a/plugins/org.eclipse.emf.edit/src/org/eclipse/emf/edit/tree/TreeNode.java b/plugins/org.eclipse.emf.edit/src/org/eclipse/emf/edit/tree/TreeNode.java
index 82e80ec63..660058818 100644
--- a/plugins/org.eclipse.emf.edit/src/org/eclipse/emf/edit/tree/TreeNode.java
+++ b/plugins/org.eclipse.emf.edit/src/org/eclipse/emf/edit/tree/TreeNode.java
@@ -22,12 +22,12 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.edit.tree.TreeNode#getParent <em>Parent</em>}</li>
* <li>{@link org.eclipse.emf.edit.tree.TreeNode#getChildren <em>Children</em>}</li>
* <li>{@link org.eclipse.emf.edit.tree.TreeNode#getData <em>Data</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.edit.tree.TreePackage#getTreeNode()
* @model
diff --git a/plugins/org.eclipse.emf.edit/src/org/eclipse/emf/edit/tree/impl/TreeNodeImpl.java b/plugins/org.eclipse.emf.edit/src/org/eclipse/emf/edit/tree/impl/TreeNodeImpl.java
index 75b26cc97..97196058b 100644
--- a/plugins/org.eclipse.emf.edit/src/org/eclipse/emf/edit/tree/impl/TreeNodeImpl.java
+++ b/plugins/org.eclipse.emf.edit/src/org/eclipse/emf/edit/tree/impl/TreeNodeImpl.java
@@ -34,12 +34,12 @@ import org.eclipse.emf.edit.tree.TreePackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.edit.tree.impl.TreeNodeImpl#getParent <em>Parent</em>}</li>
* <li>{@link org.eclipse.emf.edit.tree.impl.TreeNodeImpl#getChildren <em>Children</em>}</li>
* <li>{@link org.eclipse.emf.edit.tree.impl.TreeNodeImpl#getData <em>Data</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.edit/src/org/eclipse/emf/edit/tree/util/TreeSwitch.java b/plugins/org.eclipse.emf.edit/src/org/eclipse/emf/edit/tree/util/TreeSwitch.java
index c23e57f87..f2addf48c 100644
--- a/plugins/org.eclipse.emf.edit/src/org/eclipse/emf/edit/tree/util/TreeSwitch.java
+++ b/plugins/org.eclipse.emf.edit/src/org/eclipse/emf/edit/tree/util/TreeSwitch.java
@@ -57,7 +57,7 @@ public class TreeSwitch<T> extends Switch<T> {
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/plugins/org.eclipse.emf.importer.rose/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.importer.rose/META-INF/MANIFEST.MF
index 7d519d930..20ffea85a 100644
--- a/plugins/org.eclipse.emf.importer.rose/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.importer.rose/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.importer.rose; singleton:=true
-Bundle-Version: 2.7.0.qualifier
+Bundle-Version: 2.8.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.importer.rose.RoseImporterPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.importer.rose/src/org/eclipse/emf/importer/rose/parser/RoseParser.java b/plugins/org.eclipse.emf.importer.rose/src/org/eclipse/emf/importer/rose/parser/RoseParser.java
index c9a0977d1..a581dbf73 100644
--- a/plugins/org.eclipse.emf.importer.rose/src/org/eclipse/emf/importer/rose/parser/RoseParser.java
+++ b/plugins/org.eclipse.emf.importer.rose/src/org/eclipse/emf/importer/rose/parser/RoseParser.java
@@ -379,8 +379,7 @@ public class RoseParser
}
else if (tok.getType() == RoseToken.VERTICAL_BAR)
{
- RoseNode root = null;
- root = new RoseNode(key, "", RoseNode.STRING_SEQ);
+ RoseNode root = new RoseNode(key, "", RoseNode.STRING_SEQ);
while (true)
{
tok = lexer.peekNext();
@@ -401,10 +400,7 @@ public class RoseParser
RoseNode node = null;
node = new RoseNode("", tok.getValue(), RoseNode.STRING);
- if (root != null)
- {
root.addNode(node);
- }
}
return root;
}
diff --git a/plugins/org.eclipse.emf.mapping.ecore2ecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.mapping.ecore2ecore/META-INF/MANIFEST.MF
index d9bd03514..e90128b50 100644
--- a/plugins/org.eclipse.emf.mapping.ecore2ecore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.mapping.ecore2ecore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.mapping.ecore2ecore;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.mapping.ecore2ecore.Ecore2EcorePlugin$Implementation$Activator
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.mapping.ecore2ecore/src/org/eclipse/emf/mapping/ecore2ecore/impl/Ecore2EcoreMappingRootImpl.java b/plugins/org.eclipse.emf.mapping.ecore2ecore/src/org/eclipse/emf/mapping/ecore2ecore/impl/Ecore2EcoreMappingRootImpl.java
index 24a0d4904..932644457 100644
--- a/plugins/org.eclipse.emf.mapping.ecore2ecore/src/org/eclipse/emf/mapping/ecore2ecore/impl/Ecore2EcoreMappingRootImpl.java
+++ b/plugins/org.eclipse.emf.mapping.ecore2ecore/src/org/eclipse/emf/mapping/ecore2ecore/impl/Ecore2EcoreMappingRootImpl.java
@@ -27,8 +27,6 @@ import org.eclipse.emf.mapping.impl.MappingRootImpl;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Mapping Root</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.mapping.ecore2ecore/src/org/eclipse/emf/mapping/ecore2ecore/util/Ecore2EcoreSwitch.java b/plugins/org.eclipse.emf.mapping.ecore2ecore/src/org/eclipse/emf/mapping/ecore2ecore/util/Ecore2EcoreSwitch.java
index 90ca68d02..7fa77cdf2 100644
--- a/plugins/org.eclipse.emf.mapping.ecore2ecore/src/org/eclipse/emf/mapping/ecore2ecore/util/Ecore2EcoreSwitch.java
+++ b/plugins/org.eclipse.emf.mapping.ecore2ecore/src/org/eclipse/emf/mapping/ecore2ecore/util/Ecore2EcoreSwitch.java
@@ -61,7 +61,7 @@ public class Ecore2EcoreSwitch<T> extends Switch<T> {
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/plugins/org.eclipse.emf.mapping.ecore2xml.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.mapping.ecore2xml.ui/META-INF/MANIFEST.MF
index f3baa6639..35518a08f 100644
--- a/plugins/org.eclipse.emf.mapping.ecore2xml.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.mapping.ecore2xml.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.mapping.ecore2xml.ui;singleton:=true
-Bundle-Version: 2.7.0.qualifier
+Bundle-Version: 2.8.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.mapping.ecore2xml.ui.Ecore2XMLUIPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.mapping.ecore2xml.ui/src/org/eclipse/emf/mapping/ecore2xml/presentation/Ecore2XMLEditor.java b/plugins/org.eclipse.emf.mapping.ecore2xml.ui/src/org/eclipse/emf/mapping/ecore2xml/presentation/Ecore2XMLEditor.java
index 2a7678583..1cc98bdc3 100644
--- a/plugins/org.eclipse.emf.mapping.ecore2xml.ui/src/org/eclipse/emf/mapping/ecore2xml/presentation/Ecore2XMLEditor.java
+++ b/plugins/org.eclipse.emf.mapping.ecore2xml.ui/src/org/eclipse/emf/mapping/ecore2xml/presentation/Ecore2XMLEditor.java
@@ -1102,11 +1102,12 @@ public class Ecore2XMLEditor
*/
public Diagnostic analyzeResourceProblems(Resource resource, Exception exception)
{
- if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty())
+ boolean hasErrors = !resource.getErrors().isEmpty();
+ if (hasErrors || !resource.getWarnings().isEmpty())
{
BasicDiagnostic basicDiagnostic =
new BasicDiagnostic
- (Diagnostic.ERROR,
+ (hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
"org.eclipse.emf.mapping.ecore2xml.ui", //$NON-NLS-1$
0,
getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
@@ -1470,7 +1471,7 @@ public class Ecore2XMLEditor
* <!-- end-user-doc -->
* @generated
*/
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public Object getAdapter(Class key)
{
diff --git a/plugins/org.eclipse.emf.mapping.ecore2xml/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.mapping.ecore2xml/META-INF/MANIFEST.MF
index e231b68eb..b9f281fa2 100644
--- a/plugins/org.eclipse.emf.mapping.ecore2xml/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.mapping.ecore2xml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.mapping.ecore2xml;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/XMLInfo.java b/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/XMLInfo.java
index cb94e868d..f3993c669 100644
--- a/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/XMLInfo.java
+++ b/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/XMLInfo.java
@@ -21,12 +21,12 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.mapping.ecore2xml.XMLInfo#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.mapping.ecore2xml.XMLInfo#getTargetNamespace <em>Target Namespace</em>}</li>
* <li>{@link org.eclipse.emf.mapping.ecore2xml.XMLInfo#getXMLRepresentation <em>XML Representation</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.mapping.ecore2xml.Ecore2XMLPackage#getXMLInfo()
* @model
diff --git a/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/XMLMap.java b/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/XMLMap.java
index 165dcefa0..d9de7168a 100644
--- a/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/XMLMap.java
+++ b/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/XMLMap.java
@@ -26,12 +26,12 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.mapping.ecore2xml.XMLMap#getIDAttributeName <em>ID Attribute Name</em>}</li>
* <li>{@link org.eclipse.emf.mapping.ecore2xml.XMLMap#getEcoreToXMLInfo <em>Ecore To XML Info</em>}</li>
* <li>{@link org.eclipse.emf.mapping.ecore2xml.XMLMap#getNoNamespacePackage <em>No Namespace Package</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.mapping.ecore2xml.Ecore2XMLPackage#getXMLMap()
* @model
diff --git a/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/impl/ENamedElementToXMLInfoMapEntryImpl.java b/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/impl/ENamedElementToXMLInfoMapEntryImpl.java
index 5ade5965a..b455858ce 100644
--- a/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/impl/ENamedElementToXMLInfoMapEntryImpl.java
+++ b/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/impl/ENamedElementToXMLInfoMapEntryImpl.java
@@ -32,11 +32,11 @@ import org.eclipse.emf.mapping.ecore2xml.XMLInfo;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.mapping.ecore2xml.impl.ENamedElementToXMLInfoMapEntryImpl#getTypedKey <em>Key</em>}</li>
* <li>{@link org.eclipse.emf.mapping.ecore2xml.impl.ENamedElementToXMLInfoMapEntryImpl#getTypedValue <em>Value</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/impl/XMLInfoImpl.java b/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/impl/XMLInfoImpl.java
index 3ee6d508d..10ee0b951 100644
--- a/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/impl/XMLInfoImpl.java
+++ b/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/impl/XMLInfoImpl.java
@@ -24,12 +24,12 @@ import org.eclipse.emf.mapping.ecore2xml.XMLInfo;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.mapping.ecore2xml.impl.XMLInfoImpl#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.mapping.ecore2xml.impl.XMLInfoImpl#getTargetNamespace <em>Target Namespace</em>}</li>
* <li>{@link org.eclipse.emf.mapping.ecore2xml.impl.XMLInfoImpl#getXMLRepresentation <em>XML Representation</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/impl/XMLMapImpl.java b/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/impl/XMLMapImpl.java
index 154052dba..9f996ac4c 100644
--- a/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/impl/XMLMapImpl.java
+++ b/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/impl/XMLMapImpl.java
@@ -41,12 +41,12 @@ import org.eclipse.emf.mapping.ecore2xml.XMLMap;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.mapping.ecore2xml.impl.XMLMapImpl#getIDAttributeName <em>ID Attribute Name</em>}</li>
* <li>{@link org.eclipse.emf.mapping.ecore2xml.impl.XMLMapImpl#getEcoreToXMLInfo <em>Ecore To XML Info</em>}</li>
* <li>{@link org.eclipse.emf.mapping.ecore2xml.impl.XMLMapImpl#getNoNamespacePackage <em>No Namespace Package</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/util/Ecore2XMLSwitch.java b/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/util/Ecore2XMLSwitch.java
index 15792deec..b87dd0481 100644
--- a/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/util/Ecore2XMLSwitch.java
+++ b/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/util/Ecore2XMLSwitch.java
@@ -59,7 +59,7 @@ public class Ecore2XMLSwitch<T> extends Switch<T> {
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/plugins/org.eclipse.emf.mapping.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.mapping.ui/META-INF/MANIFEST.MF
index 8888bdadd..54d6cdc4d 100644
--- a/plugins/org.eclipse.emf.mapping.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.mapping.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.mapping.ui;singleton:=true
-Bundle-Version: 2.6.0.qualifier
+Bundle-Version: 2.7.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.mapping.presentation.MappingUIPlugin
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.mapping.ui/src/org/eclipse/emf/mapping/presentation/MappingEditor.java b/plugins/org.eclipse.emf.mapping.ui/src/org/eclipse/emf/mapping/presentation/MappingEditor.java
index 777a7d727..3444996bf 100644
--- a/plugins/org.eclipse.emf.mapping.ui/src/org/eclipse/emf/mapping/presentation/MappingEditor.java
+++ b/plugins/org.eclipse.emf.mapping.ui/src/org/eclipse/emf/mapping/presentation/MappingEditor.java
@@ -1662,7 +1662,7 @@ public abstract class MappingEditor
/**
* This is how the framework determines which interfaces we implement.
*/
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public Object getAdapter(Class key)
{
diff --git a/plugins/org.eclipse.emf.mapping/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.mapping/META-INF/MANIFEST.MF
index 6db12e30f..e337e3285 100644
--- a/plugins/org.eclipse.emf.mapping/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.mapping/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.mapping;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.mapping.MappingPlugin$Implementation$Activator
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/ComplexTypeConverter.java b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/ComplexTypeConverter.java
index 0c3185c4c..b0ac73981 100644
--- a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/ComplexTypeConverter.java
+++ b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/ComplexTypeConverter.java
@@ -19,11 +19,11 @@ package org.eclipse.emf.mapping;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.mapping.ComplexTypeConverter#getIn2out <em>In2out</em>}</li>
* <li>{@link org.eclipse.emf.mapping.ComplexTypeConverter#getOut2in <em>Out2in</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.mapping.MappingPackage#getComplexTypeConverter()
* @model
diff --git a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/FunctionNamePair.java b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/FunctionNamePair.java
index dd7986250..36b4910bb 100644
--- a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/FunctionNamePair.java
+++ b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/FunctionNamePair.java
@@ -19,11 +19,11 @@ package org.eclipse.emf.mapping;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.mapping.FunctionNamePair#getIn2out <em>In2out</em>}</li>
* <li>{@link org.eclipse.emf.mapping.FunctionNamePair#getOut2in <em>Out2in</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.mapping.MappingPackage#getFunctionNamePair()
* @model
diff --git a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/FunctionPair.java b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/FunctionPair.java
index 114dbce4d..7e143dc4a 100644
--- a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/FunctionPair.java
+++ b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/FunctionPair.java
@@ -21,11 +21,11 @@ import org.eclipse.emf.ecore.EOperation;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.mapping.FunctionPair#getIn2out <em>In2out</em>}</li>
* <li>{@link org.eclipse.emf.mapping.FunctionPair#getOut2in <em>Out2in</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.mapping.MappingPackage#getFunctionPair()
* @model
diff --git a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/Mapping.java b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/Mapping.java
index 878a1efff..1886efe0f 100644
--- a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/Mapping.java
+++ b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/Mapping.java
@@ -25,6 +25,7 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.mapping.Mapping#getHelper <em>Helper</em>}</li>
* <li>{@link org.eclipse.emf.mapping.Mapping#getNested <em>Nested</em>}</li>
@@ -33,7 +34,6 @@ import org.eclipse.emf.ecore.EObject;
* <li>{@link org.eclipse.emf.mapping.Mapping#getOutputs <em>Outputs</em>}</li>
* <li>{@link org.eclipse.emf.mapping.Mapping#getTypeMapping <em>Type Mapping</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.mapping.MappingPackage#getMapping()
* @model
diff --git a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/MappingHelper.java b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/MappingHelper.java
index eb13530f0..5459ad7ef 100644
--- a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/MappingHelper.java
+++ b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/MappingHelper.java
@@ -22,13 +22,13 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.mapping.MappingHelper#getMapper <em>Mapper</em>}</li>
* <li>{@link org.eclipse.emf.mapping.MappingHelper#getHelpedObject <em>Helped Object</em>}</li>
* <li>{@link org.eclipse.emf.mapping.MappingHelper#getNestedIn <em>Nested In</em>}</li>
* <li>{@link org.eclipse.emf.mapping.MappingHelper#getNested <em>Nested</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.mapping.MappingPackage#getMappingHelper()
* @model
diff --git a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/MappingRoot.java b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/MappingRoot.java
index 36bababa8..a4c2ba473 100644
--- a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/MappingRoot.java
+++ b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/MappingRoot.java
@@ -23,12 +23,12 @@ import org.eclipse.emf.mapping.domain.MappingDomain;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.mapping.MappingRoot#isOutputReadOnly <em>Output Read Only</em>}</li>
* <li>{@link org.eclipse.emf.mapping.MappingRoot#isTopToBottom <em>Top To Bottom</em>}</li>
* <li>{@link org.eclipse.emf.mapping.MappingRoot#getCommandStack <em>Command Stack</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.mapping.MappingPackage#getMappingRoot()
* @model
diff --git a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/ComplexTypeConverterImpl.java b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/ComplexTypeConverterImpl.java
index ddc9f5066..f9c864575 100644
--- a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/ComplexTypeConverterImpl.java
+++ b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/ComplexTypeConverterImpl.java
@@ -26,11 +26,11 @@ import org.eclipse.emf.mapping.MappingPackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.mapping.impl.ComplexTypeConverterImpl#getIn2out <em>In2out</em>}</li>
* <li>{@link org.eclipse.emf.mapping.impl.ComplexTypeConverterImpl#getOut2in <em>Out2in</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/FunctionNamePairImpl.java b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/FunctionNamePairImpl.java
index 08c46792b..b43f06432 100644
--- a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/FunctionNamePairImpl.java
+++ b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/FunctionNamePairImpl.java
@@ -24,11 +24,11 @@ import org.eclipse.emf.mapping.MappingPackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.mapping.impl.FunctionNamePairImpl#getIn2out <em>In2out</em>}</li>
* <li>{@link org.eclipse.emf.mapping.impl.FunctionNamePairImpl#getOut2in <em>Out2in</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/FunctionPairImpl.java b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/FunctionPairImpl.java
index ab74133b0..dfc209765 100644
--- a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/FunctionPairImpl.java
+++ b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/FunctionPairImpl.java
@@ -26,11 +26,11 @@ import org.eclipse.emf.mapping.MappingPackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.mapping.impl.FunctionPairImpl#getIn2out <em>In2out</em>}</li>
* <li>{@link org.eclipse.emf.mapping.impl.FunctionPairImpl#getOut2in <em>Out2in</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/MappingHelperImpl.java b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/MappingHelperImpl.java
index 8cd9796da..630801101 100644
--- a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/MappingHelperImpl.java
+++ b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/MappingHelperImpl.java
@@ -35,13 +35,13 @@ import org.eclipse.emf.mapping.MappingPackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.mapping.impl.MappingHelperImpl#getMapper <em>Mapper</em>}</li>
* <li>{@link org.eclipse.emf.mapping.impl.MappingHelperImpl#getHelpedObject <em>Helped Object</em>}</li>
* <li>{@link org.eclipse.emf.mapping.impl.MappingHelperImpl#getNestedIn <em>Nested In</em>}</li>
* <li>{@link org.eclipse.emf.mapping.impl.MappingHelperImpl#getNested <em>Nested</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/MappingImpl.java b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/MappingImpl.java
index d906c44d7..5ae4e9683 100644
--- a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/MappingImpl.java
+++ b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/MappingImpl.java
@@ -41,6 +41,7 @@ import org.eclipse.emf.mapping.MappingRoot;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.mapping.impl.MappingImpl#getHelper <em>Helper</em>}</li>
* <li>{@link org.eclipse.emf.mapping.impl.MappingImpl#getNested <em>Nested</em>}</li>
@@ -49,7 +50,6 @@ import org.eclipse.emf.mapping.MappingRoot;
* <li>{@link org.eclipse.emf.mapping.impl.MappingImpl#getOutputs <em>Outputs</em>}</li>
* <li>{@link org.eclipse.emf.mapping.impl.MappingImpl#getTypeMapping <em>Type Mapping</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/MappingRootImpl.java b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/MappingRootImpl.java
index c6f6586f9..5d7b3569d 100644
--- a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/MappingRootImpl.java
+++ b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/MappingRootImpl.java
@@ -49,12 +49,12 @@ import org.eclipse.emf.mapping.domain.MappingDomain;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.mapping.impl.MappingRootImpl#isOutputReadOnly <em>Output Read Only</em>}</li>
* <li>{@link org.eclipse.emf.mapping.impl.MappingRootImpl#isTopToBottom <em>Top To Bottom</em>}</li>
* <li>{@link org.eclipse.emf.mapping.impl.MappingRootImpl#getCommandStack <em>Command Stack</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/MappingStrategyImpl.java b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/MappingStrategyImpl.java
index a2e409b1f..7c889486f 100644
--- a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/MappingStrategyImpl.java
+++ b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/MappingStrategyImpl.java
@@ -20,8 +20,6 @@ import org.eclipse.emf.mapping.MappingStrategy;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Strategy</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/TypeConverterImpl.java b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/TypeConverterImpl.java
index dc0887330..d0bbc9be9 100644
--- a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/TypeConverterImpl.java
+++ b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/TypeConverterImpl.java
@@ -20,8 +20,6 @@ import org.eclipse.emf.mapping.TypeConverter;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Type Converter</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/util/MappingSwitch.java b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/util/MappingSwitch.java
index fc882b111..625fbf98c 100644
--- a/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/util/MappingSwitch.java
+++ b/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/util/MappingSwitch.java
@@ -58,7 +58,7 @@ public class MappingSwitch<T> extends Switch<T>
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/plugins/org.eclipse.emf.rap.common.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.rap.common.ui/META-INF/MANIFEST.MF
index a12c46391..c8e118be6 100755
--- a/plugins/org.eclipse.emf.rap.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.rap.common.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.rap.common.ui;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.common.ui.CommonUIPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.rap.common.ui/src/org/eclipse/emf/common/ui/URIEditorInput.java b/plugins/org.eclipse.emf.rap.common.ui/src/org/eclipse/emf/common/ui/URIEditorInput.java
index 599be2e29..00063d8e7 100755
--- a/plugins/org.eclipse.emf.rap.common.ui/src/org/eclipse/emf/common/ui/URIEditorInput.java
+++ b/plugins/org.eclipse.emf.rap.common.ui/src/org/eclipse/emf/common/ui/URIEditorInput.java
@@ -117,7 +117,7 @@ public class URIEditorInput implements IEditorInput, IPersistableElement
return this;
}
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({ "rawtypes", "unchecked" })
public Object getAdapter(Class adapter)
{
return null;
diff --git a/tests/org.eclipse.emf.test.common/models/Reification/Reification.genmodel b/tests/org.eclipse.emf.test.common/models/Reification/Reification.genmodel
index 541f70bdf..2d16d7687 100644
--- a/tests/org.eclipse.emf.test.common/models/Reification/Reification.genmodel
+++ b/tests/org.eclipse.emf.test.common/models/Reification/Reification.genmodel
@@ -1,7 +1,8 @@
<?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.test.common/src" modelPluginID="org.eclipse.emf.test.common"
- modelName="Reification" importerID="org.eclipse.emf.importer.ecore" arrayAccessors="true"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.test.common/src" editDirectory=""
+ editorDirectory="" modelPluginID="org.eclipse.emf.test.common" modelName="Reification"
+ testsDirectory="" importerID="org.eclipse.emf.importer.ecore" arrayAccessors="true"
complianceLevel="5.0" copyrightFields="false">
<foreignModel>Reification.ecore</foreignModel>
<genPackages prefix="Reification" basePackage="org.eclipse.emf.test.common" disposableProviderFactory="true"
diff --git a/tests/org.eclipse.emf.test.common/models/edit.RefTest/ref.ecore b/tests/org.eclipse.emf.test.common/models/edit.RefTest/ref.ecore
index e32f1b91f..54aaebbb4 100644
--- a/tests/org.eclipse.emf.test.common/models/edit.RefTest/ref.ecore
+++ b/tests/org.eclipse.emf.test.common/models/edit.RefTest/ref.ecore
@@ -1,20 +1,18 @@
<?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="ref"
- nsURI="http:///org.eclipse.emf.test.models/ref" nsPrefix="org.eclipse.emf.test.models.ref">
+<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="ref" nsURI="http:///org.eclipse.emf.test.models/ref" nsPrefix="org.eclipse.emf.test.models.ref">
<eClassifiers xsi:type="ecore:EClass" name="A">
<eStructuralFeatures xsi:type="ecore:EReference" name="b" lowerBound="1" eType="#//B"
eOpposite="#//B/a"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="c2" lowerBound="1" eType="#//C2"
- transient="true" eOpposite="#//C2/a"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="c2" eType="#//C2" transient="true"
+ eOpposite="#//C2/a"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="c" lowerBound="1" eType="#//C"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="B">
<eStructuralFeatures xsi:type="ecore:EReference" name="a" lowerBound="1" eType="#//A"
eOpposite="#//A/b"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="c2" lowerBound="1" eType="#//C2"
- transient="true" eOpposite="#//C2/b"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="c2" eType="#//C2" transient="true"
+ eOpposite="#//C2/b"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="d" upperBound="-1" eType="#//D"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="C1">
@@ -32,16 +30,16 @@
<eClassifiers xsi:type="ecore:EClass" name="C">
<eStructuralFeatures xsi:type="ecore:EReference" name="d" upperBound="-1" eType="#//D"
eOpposite="#//D/c"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="c4" lowerBound="1" eType="#//C4"
- transient="true" eOpposite="#//C4/c"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="c4" eType="#//C4" transient="true"
+ eOpposite="#//C4/c"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="D">
<eStructuralFeatures xsi:type="ecore:EReference" name="c" lowerBound="1" eType="#//C"
eOpposite="#//C/d"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="e" upperBound="-1" eType="#//E"
eOpposite="#//E/d"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="c4" lowerBound="1" eType="#//C4"
- transient="true" eOpposite="#//C4/d"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="c4" eType="#//C4" transient="true"
+ eOpposite="#//C4/d"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="E">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -80,15 +78,15 @@
<eClassifiers xsi:type="ecore:EClass" name="AU">
<eStructuralFeatures xsi:type="ecore:EReference" name="bu" lowerBound="1" eType="#//unsettable/BU"
unsettable="true" eOpposite="#//unsettable/BU/au"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="c2u" lowerBound="1" eType="#//unsettable/C2U"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="c2u" eType="#//unsettable/C2U"
transient="true" unsettable="true" eOpposite="#//unsettable/C2U/au"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="cu" lowerBound="1" eType="#//unsettable/CU"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="cu" eType="#//unsettable/CU"
unsettable="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="BU">
<eStructuralFeatures xsi:type="ecore:EReference" name="au" lowerBound="1" eType="#//unsettable/AU"
unsettable="true" eOpposite="#//unsettable/AU/bu"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="c2u" lowerBound="1" eType="#//unsettable/C2U"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="c2u" eType="#//unsettable/C2U"
transient="true" unsettable="true" eOpposite="#//unsettable/C2U/bu"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="du" upperBound="-1" eType="#//unsettable/DU"
unsettable="true"/>
@@ -96,13 +94,13 @@
<eClassifiers xsi:type="ecore:EClass" name="CU">
<eStructuralFeatures xsi:type="ecore:EReference" name="du" upperBound="-1" eType="#//unsettable/DU"
unsettable="true" eOpposite="#//unsettable/DU/cu"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="c4u" lowerBound="1" eType="#//unsettable/C4U"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="c4u" eType="#//unsettable/C4U"
transient="true" unsettable="true" eOpposite="#//unsettable/C4U/cu"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DU">
<eStructuralFeatures xsi:type="ecore:EReference" name="cu" lowerBound="1" eType="#//unsettable/CU"
unsettable="true" eOpposite="#//unsettable/CU/du"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="c4u" lowerBound="1" eType="#//unsettable/C4U"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="c4u" eType="#//unsettable/C4U"
transient="true" unsettable="true" eOpposite="#//unsettable/C4U/du"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="eu" upperBound="-1" eType="#//unsettable/EU"
unsettable="true" eOpposite="#//unsettable/EU/du"/>
diff --git a/tests/org.eclipse.emf.test.common/plugin.xml b/tests/org.eclipse.emf.test.common/plugin.xml
index 081acdf42..9477f9124 100644
--- a/tests/org.eclipse.emf.test.common/plugin.xml
+++ b/tests/org.eclipse.emf.test.common/plugin.xml
@@ -107,6 +107,14 @@
</extension>
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated moviedb -->
+ <package
+ uri="http:///org.eclipse.emf.test.models/Customer"
+ class="org.eclipse.emf.test.models.customer.CustomerPackage"
+ genModel="models/MovieDB/moviedb.genmodel"/>
+ </extension>
+
<extension point="org.eclipse.emf.ecore.extension_parser">
<!-- MovieDB -->
@@ -125,6 +133,36 @@
</extension>
<extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated moviedb -->
+ <package
+ uri="http:///org.eclipse.emf.test.models/MovieDB"
+ class="org.eclipse.emf.test.models.movie.db.DBPackage"
+ genModel="models/MovieDB/moviedb.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.extension_parser">
+ <!-- @generated moviedb -->
+ <parser
+ type="db"
+ class="org.eclipse.emf.test.models.movie.db.util.DBResourceFactoryImpl"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated moviedb -->
+ <package
+ uri="http:///org.eclipse.emf.test.models/Order"
+ class="org.eclipse.emf.test.models.order.OrderPackage"
+ genModel="models/MovieDB/moviedb.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.extension_parser">
+ <!-- @generated moviedb -->
+ <parser
+ type="order"
+ class="org.eclipse.emf.test.models.order.util.OrderResourceFactoryImpl"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
<!-- @generated Reification -->
<package
uri="http://www.eclipse.org/emf/test/common/Reification"
@@ -132,4 +170,176 @@
genModel="models/Reification/Reification.genmodel"/>
</extension>
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated dbitem -->
+ <package
+ uri="http:///org.eclipse.emf.test.models/dbitem"
+ class="org.eclipse.emf.test.models.dbitem.DBItemPackage"
+ genModel="models/ItemDB/dbitem.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.extension_parser">
+ <!-- @generated dbitem -->
+ <parser
+ type="dbitem"
+ class="org.eclipse.emf.test.models.dbitem.util.DBItemResourceFactoryImpl"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated dbitem -->
+ <package
+ uri="http:///org.eclipse.emf.test.models/dbprice"
+ class="org.eclipse.emf.test.models.dbprice.DBPricePackage"
+ genModel="models/ItemDB/dbitem.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.extension_parser">
+ <!-- @generated dbitem -->
+ <parser
+ type="dbprice"
+ class="org.eclipse.emf.test.models.dbprice.util.DBPriceResourceFactoryImpl"/>
+ </extension>
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated Key -->
+ <package
+ uri="http:///org.eclipse.emf.test.models/Key"
+ class="org.eclipse.emf.test.models.key.KeyPackage"
+ genModel="models/Key/Key.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated library -->
+ <package
+ uri="http:///org.eclipse.emf.test.models/Library"
+ class="org.eclipse.emf.test.models.library.LibraryPackage"
+ genModel="models/Library/library.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated PrimerPO -->
+ <package
+ uri="http:///org.eclipse.emf.test.models/ppo"
+ class="org.eclipse.emf.test.models.ppo.PPOPackage"
+ genModel="models/PrimerPO/PrimerPO.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated qname -->
+ <package
+ uri="http:///org.eclipse.emf.test.models/qname"
+ class="org.eclipse.emf.test.models.qname.QNamePackage"
+ genModel="models/QName/qname.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.extension_parser">
+ <!-- @generated qname -->
+ <parser
+ type="qname"
+ class="org.eclipse.emf.test.models.qname.util.QNameResourceFactoryImpl"/>
+ </extension>
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated RefTest -->
+ <package
+ uri="http:///org.eclipse.emf.test.models/ref"
+ class="org.eclipse.emf.test.models.ref.RefPackage"
+ genModel="models/edit.RefTest/RefTest.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated RefTest -->
+ <package
+ uri="http:///org/eclipse/emf/test/models/ref/unsettable.ecore"
+ class="org.eclipse.emf.test.models.ref.unsettable.URefPackage"
+ genModel="models/edit.RefTest/RefTest.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated RefTest -->
+ <package
+ uri="http:///org.eclipse.emf.test.models/ext"
+ class="org.eclipse.emf.test.models.ext.ExtPackage"
+ genModel="models/edit.RefTest/RefTest.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+ <!-- @generated RefTest -->
+ <factory
+ uri="http:///org.eclipse.emf.test.models/ref"
+ class="org.eclipse.emf.test.models.ref.provider.RefItemProviderAdapterFactory"
+ supportedTypes=
+ "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+ org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+ org.eclipse.emf.edit.provider.ITreeItemContentProvider
+ org.eclipse.emf.edit.provider.IItemLabelProvider
+ org.eclipse.emf.edit.provider.IItemPropertySource"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+ <!-- @generated RefTest -->
+ <factory
+ uri="http:///org/eclipse/emf/test/models/ref/unsettable.ecore"
+ class="org.eclipse.emf.test.models.ref.unsettable.provider.URefItemProviderAdapterFactory"
+ supportedTypes=
+ "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+ org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+ org.eclipse.emf.edit.provider.ITreeItemContentProvider
+ org.eclipse.emf.edit.provider.IItemLabelProvider
+ org.eclipse.emf.edit.provider.IItemPropertySource"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+ <!-- @generated RefTest -->
+ <factory
+ uri="http:///org.eclipse.emf.test.models/ext"
+ class="org.eclipse.emf.test.models.ext.provider.ExtItemProviderAdapterFactory"
+ supportedTypes=
+ "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+ org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+ org.eclipse.emf.edit.provider.ITreeItemContentProvider
+ org.eclipse.emf.edit.provider.IItemLabelProvider
+ org.eclipse.emf.edit.provider.IItemPropertySource"/>
+ </extension>
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated switch -->
+ <package
+ uri="http:///org.eclipse.emf.test.models/switch1"
+ class="org.eclipse.emf.test.models.switch1.Switch1Package"
+ genModel="models/Switch/switch.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated switch -->
+ <package
+ uri="http:///org.eclipse.emf.test.models/switch2"
+ class="org.eclipse.emf.test.models.switch2.Switch2Package"
+ genModel="models/Switch/switch.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated switch -->
+ <package
+ uri="http:///org.eclipse.emf.test.models/switch3"
+ class="org.eclipse.emf.test.models.switch3.Switch3Package"
+ genModel="models/Switch/switch.genmodel"/>
+ </extension>
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated tree -->
+ <package
+ uri="http:///org.eclipse.emf.test.models/Tree"
+ class="org.eclipse.emf.test.models.tree.TreePackage"
+ genModel="models/edit.Tree/tree.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+ <!-- @generated tree -->
+ <factory
+ uri="http:///org.eclipse.emf.test.models/Tree"
+ class="org.eclipse.emf.test.models.tree.provider.TreeItemProviderAdapterFactory"
+ supportedTypes=
+ "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+ org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+ org.eclipse.emf.edit.provider.ITreeItemContentProvider
+ org.eclipse.emf.edit.provider.IItemLabelProvider
+ org.eclipse.emf.edit.provider.IItemPropertySource"/>
+ </extension>
</plugin>
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/Bidirectional.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/Bidirectional.java
index f9ba69186..2ab595d0a 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/Bidirectional.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/Bidirectional.java
@@ -17,13 +17,13 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.common.reification.Bidirectional#getIn <em>In</em>}</li>
* <li>{@link org.eclipse.emf.test.common.reification.Bidirectional#getOut <em>Out</em>}</li>
* <li>{@link org.eclipse.emf.test.common.reification.Bidirectional#getValue <em>Value</em>}</li>
* <li>{@link org.eclipse.emf.test.common.reification.Bidirectional#getValuesList <em>Values</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.test.common.reification.ReificationPackage#getBidirectional()
* @model
@@ -154,7 +154,6 @@ public interface Bidirectional<T extends Bidirectional<T>> extends EObject
/**
* Returns the value of the '<em><b>Values</b></em>' reference list.
- * The list contents are of type {@link T}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Values</em>' reference list isn't clear,
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/BoundedGenericContainer.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/BoundedGenericContainer.java
index 05a9ea46e..823a0eb50 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/BoundedGenericContainer.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/BoundedGenericContainer.java
@@ -16,10 +16,10 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.common.reification.BoundedGenericContainer#getContent <em>Content</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.test.common.reification.ReificationPackage#getBoundedGenericContainer()
* @model
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/KeyValuePair.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/KeyValuePair.java
index ed171badb..519646c6d 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/KeyValuePair.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/KeyValuePair.java
@@ -17,11 +17,11 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.common.reification.KeyValuePair#getKey <em>Key</em>}</li>
* <li>{@link org.eclipse.emf.test.common.reification.KeyValuePair#getValue <em>Value</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.test.common.reification.ReificationPackage#getKeyValuePair()
* @model KBounds="org.eclipse.emf.ecore.EEList<?>"
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/KeyValuePairContainer.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/KeyValuePairContainer.java
index 1061b9a9c..281bae448 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/KeyValuePairContainer.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/KeyValuePairContainer.java
@@ -17,10 +17,10 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.common.reification.KeyValuePairContainer#getKeyValuePairsList <em>Key Value Pairs</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.test.common.reification.ReificationPackage#getKeyValuePairContainer()
* @model KBounds="org.eclipse.emf.ecore.EEList<?>"
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/MediumBidirectional.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/MediumBidirectional.java
index 05e518a97..4270fff59 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/MediumBidirectional.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/MediumBidirectional.java
@@ -17,10 +17,10 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.common.reification.MediumBidirectional#getContentsList <em>Contents</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.test.common.reification.ReificationPackage#getMediumBidirectional()
* @model
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/Root.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/Root.java
index 56d80b8a6..2f0d426cd 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/Root.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/Root.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.common.reification.Root#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.test.common.reification.Root#getContainer <em>Container</em>}</li>
@@ -28,7 +29,6 @@ import org.eclipse.emf.ecore.EObject;
* <li>{@link org.eclipse.emf.test.common.reification.Root#getBoundedGenericContainerWithSuper <em>Bounded Generic Container With Super</em>}</li>
* <li>{@link org.eclipse.emf.test.common.reification.Root#getBoundedGenericContainerWithExtends <em>Bounded Generic Container With Extends</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.test.common.reification.ReificationPackage#getRoot()
* @model
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/UnboundedGenericContainer.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/UnboundedGenericContainer.java
index d151463db..6d6570db2 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/UnboundedGenericContainer.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/UnboundedGenericContainer.java
@@ -16,10 +16,10 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.common.reification.UnboundedGenericContainer#getContent <em>Content</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.test.common.reification.ReificationPackage#getUnboundedGenericContainer()
* @model
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/BidirectionalImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/BidirectionalImpl.java
index 3de254df2..33dc6ae95 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/BidirectionalImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/BidirectionalImpl.java
@@ -27,13 +27,13 @@ import org.eclipse.emf.test.common.reification.ReificationPackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.common.reification.impl.BidirectionalImpl#getIn <em>In</em>}</li>
* <li>{@link org.eclipse.emf.test.common.reification.impl.BidirectionalImpl#getOut <em>Out</em>}</li>
* <li>{@link org.eclipse.emf.test.common.reification.impl.BidirectionalImpl#getValue <em>Value</em>}</li>
* <li>{@link org.eclipse.emf.test.common.reification.impl.BidirectionalImpl#getValuesList <em>Values</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/BoundedGenericContainerImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/BoundedGenericContainerImpl.java
index c8eae104f..be24e86ad 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/BoundedGenericContainerImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/BoundedGenericContainerImpl.java
@@ -22,10 +22,10 @@ import org.eclipse.emf.test.common.reification.ReificationPackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.common.reification.impl.BoundedGenericContainerImpl#getContent <em>Content</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/BoundedTListKeyValuePairImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/BoundedTListKeyValuePairImpl.java
index b9524fbd1..e685ddbeb 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/BoundedTListKeyValuePairImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/BoundedTListKeyValuePairImpl.java
@@ -16,8 +16,6 @@ import org.eclipse.emf.test.common.reification.ReificationPackage;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Bounded TList Key Value Pair</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/ContainerImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/ContainerImpl.java
index d12f2b89f..ec8243225 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/ContainerImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/ContainerImpl.java
@@ -16,8 +16,6 @@ import org.eclipse.emf.test.common.reification.ReificationPackage;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Container</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/HighBoundedContainerImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/HighBoundedContainerImpl.java
index af6a2f41b..3b50bd5b1 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/HighBoundedContainerImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/HighBoundedContainerImpl.java
@@ -16,8 +16,6 @@ import org.eclipse.emf.test.common.reification.ReificationPackage;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>High Bounded Container</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/HighImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/HighImpl.java
index d58e5623b..0913e0eee 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/HighImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/HighImpl.java
@@ -15,8 +15,6 @@ import org.eclipse.emf.test.common.reification.ReificationPackage;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>High</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/HighListKeyValuePairImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/HighListKeyValuePairImpl.java
index 180022ff5..02c535732 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/HighListKeyValuePairImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/HighListKeyValuePairImpl.java
@@ -16,8 +16,6 @@ import org.eclipse.emf.test.common.reification.ReificationPackage;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>High List Key Value Pair</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/IntegerListKeyValuePairImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/IntegerListKeyValuePairImpl.java
index 023855529..e5b4dac58 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/IntegerListKeyValuePairImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/IntegerListKeyValuePairImpl.java
@@ -15,8 +15,6 @@ import org.eclipse.emf.test.common.reification.ReificationPackage;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Integer List Key Value Pair</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/KeyValuePairContainerImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/KeyValuePairContainerImpl.java
index 478c74138..a488e35ae 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/KeyValuePairContainerImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/KeyValuePairContainerImpl.java
@@ -24,10 +24,10 @@ import org.eclipse.emf.test.common.reification.ReificationPackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.common.reification.impl.KeyValuePairContainerImpl#getKeyValuePairsList <em>Key Value Pairs</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/KeyValuePairImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/KeyValuePairImpl.java
index 4a20bcc7b..238345fa4 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/KeyValuePairImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/KeyValuePairImpl.java
@@ -23,11 +23,11 @@ import org.eclipse.emf.test.common.reification.ReificationPackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.common.reification.impl.KeyValuePairImpl#getKey <em>Key</em>}</li>
* <li>{@link org.eclipse.emf.test.common.reification.impl.KeyValuePairImpl#getValue <em>Value</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/LinkImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/LinkImpl.java
index 521c890f1..da37f1a81 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/LinkImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/LinkImpl.java
@@ -19,8 +19,6 @@ import org.eclipse.emf.test.common.reification.ReificationPackage;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Link</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/LinkItemImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/LinkItemImpl.java
index df16ea2a2..92478a5c8 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/LinkItemImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/LinkItemImpl.java
@@ -19,8 +19,6 @@ import org.eclipse.emf.test.common.reification.ReificationPackage;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Link Item</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/LowImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/LowImpl.java
index c2079140d..f574a0578 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/LowImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/LowImpl.java
@@ -15,8 +15,6 @@ import org.eclipse.emf.test.common.reification.ReificationPackage;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Low</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/MediumBidirectionalImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/MediumBidirectionalImpl.java
index 5b0490043..cae1e6296 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/MediumBidirectionalImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/MediumBidirectionalImpl.java
@@ -24,10 +24,10 @@ import org.eclipse.emf.test.common.reification.ReificationPackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.common.reification.impl.MediumBidirectionalImpl#getContentsList <em>Contents</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/MediumImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/MediumImpl.java
index f3191159a..8e24358ac 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/MediumImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/MediumImpl.java
@@ -15,8 +15,6 @@ import org.eclipse.emf.test.common.reification.ReificationPackage;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Medium</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/MediumLinkImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/MediumLinkImpl.java
index 976ef9672..752ea0e2f 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/MediumLinkImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/MediumLinkImpl.java
@@ -15,8 +15,6 @@ import org.eclipse.emf.test.common.reification.ReificationPackage;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Medium Link</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/MediumUnboundedContainerImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/MediumUnboundedContainerImpl.java
index 53137089d..80c519bd1 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/MediumUnboundedContainerImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/MediumUnboundedContainerImpl.java
@@ -17,8 +17,6 @@ import org.eclipse.emf.test.common.reification.ReificationPackage;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Medium Unbounded Container</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/RawKeyValuePairImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/RawKeyValuePairImpl.java
index 38ec0d2cd..9e8770bd7 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/RawKeyValuePairImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/RawKeyValuePairImpl.java
@@ -15,8 +15,6 @@ import org.eclipse.emf.test.common.reification.ReificationPackage;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Raw Key Value Pair</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/RawLinkImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/RawLinkImpl.java
index b11015b30..05167f9b0 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/RawLinkImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/RawLinkImpl.java
@@ -15,8 +15,6 @@ import org.eclipse.emf.test.common.reification.ReificationPackage;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Raw Link</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/RawUnboundedContainerImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/RawUnboundedContainerImpl.java
index d729b9b71..c9749f9c9 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/RawUnboundedContainerImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/RawUnboundedContainerImpl.java
@@ -15,8 +15,6 @@ import org.eclipse.emf.test.common.reification.ReificationPackage;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Raw Unbounded Container</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/ReificationFactoryImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/ReificationFactoryImpl.java
index f6dbd9a17..42af1130a 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/ReificationFactoryImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/ReificationFactoryImpl.java
@@ -60,7 +60,7 @@ public class ReificationFactoryImpl extends EFactoryImpl implements ReificationF
{
try
{
- ReificationFactory theReificationFactory = (ReificationFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/test/common/Reification");
+ ReificationFactory theReificationFactory = (ReificationFactory)EPackage.Registry.INSTANCE.getEFactory(ReificationPackage.eNS_URI);
if (theReificationFactory != null)
{
return theReificationFactory;
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/RootImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/RootImpl.java
index 9cc0dde59..1b86ab663 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/RootImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/RootImpl.java
@@ -26,6 +26,7 @@ import org.eclipse.emf.test.common.reification.UnboundedGenericContainer;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.common.reification.impl.RootImpl#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.test.common.reification.impl.RootImpl#getContainer <em>Container</em>}</li>
@@ -38,7 +39,6 @@ import org.eclipse.emf.test.common.reification.UnboundedGenericContainer;
* <li>{@link org.eclipse.emf.test.common.reification.impl.RootImpl#getBoundedGenericContainerWithSuper <em>Bounded Generic Container With Super</em>}</li>
* <li>{@link org.eclipse.emf.test.common.reification.impl.RootImpl#getBoundedGenericContainerWithExtends <em>Bounded Generic Container With Extends</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/StringListKeyValuePairContainerImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/StringListKeyValuePairContainerImpl.java
index 491b85de7..ef1b6bb01 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/StringListKeyValuePairContainerImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/StringListKeyValuePairContainerImpl.java
@@ -17,8 +17,6 @@ import org.eclipse.emf.test.common.reification.StringListKeyValuePairContainer;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>String List Key Value Pair Container</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/StringListKeyValuePairImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/StringListKeyValuePairImpl.java
index 088c02ac7..7b54b0f7a 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/StringListKeyValuePairImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/StringListKeyValuePairImpl.java
@@ -17,8 +17,6 @@ import org.eclipse.emf.test.common.reification.StringListKeyValuePair;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>String List Key Value Pair</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/TListKeyValuePairImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/TListKeyValuePairImpl.java
index 45d948160..3f9ea896e 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/TListKeyValuePairImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/TListKeyValuePairImpl.java
@@ -17,8 +17,6 @@ import org.eclipse.emf.test.common.reification.TListKeyValuePair;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>TList Key Value Pair</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/UnboundedGenericContainerImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/UnboundedGenericContainerImpl.java
index e8b2c5d18..47ec1967e 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/UnboundedGenericContainerImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/UnboundedGenericContainerImpl.java
@@ -22,10 +22,10 @@ import org.eclipse.emf.test.common.reification.UnboundedGenericContainer;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.common.reification.impl.UnboundedGenericContainerImpl#getContent <em>Content</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/VeryHighImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/VeryHighImpl.java
index 01b5e034d..57dc08c43 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/VeryHighImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/VeryHighImpl.java
@@ -15,8 +15,6 @@ import org.eclipse.emf.test.common.reification.VeryHigh;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Very High</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/VeryLowImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/VeryLowImpl.java
index 0b5782e4e..063eae1ba 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/VeryLowImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/impl/VeryLowImpl.java
@@ -16,8 +16,6 @@ import org.eclipse.emf.test.common.reification.VeryLow;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Very Low</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/util/ReificationSwitch.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/util/ReificationSwitch.java
index f75e0dffe..b2ab59e49 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/util/ReificationSwitch.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/common/reification/util/ReificationSwitch.java
@@ -81,7 +81,7 @@ public class ReificationSwitch<T1> extends Switch<T1>
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/AddressType.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/AddressType.java
index d7ef41ac6..b0fc12cb1 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/AddressType.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/AddressType.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.customer.AddressType#getStreet <em>Street</em>}</li>
* <li>{@link org.eclipse.emf.test.models.customer.AddressType#getTown <em>Town</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.test.models.customer.CustomerPackage#getAddressType()
* @model abstract="true"
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/CanadaAddr.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/CanadaAddr.java
index 7291c42ab..b412db6c0 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/CanadaAddr.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/CanadaAddr.java
@@ -18,11 +18,11 @@ package org.eclipse.emf.test.models.customer;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.models.customer.CanadaAddr#getZip <em>Zip</em>}</li>
* <li>{@link org.eclipse.emf.test.models.customer.CanadaAddr#getProvince <em>Province</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.test.models.customer.CustomerPackage#getCanadaAddr()
* @model extendedMetaData="name='canadaAddr' kind='elementOnly'"
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/CreditInfo.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/CreditInfo.java
index e0a0b8d8e..907c00cad 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/CreditInfo.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/CreditInfo.java
@@ -23,12 +23,12 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.models.customer.CreditInfo#getHolder <em>Holder</em>}</li>
* <li>{@link org.eclipse.emf.test.models.customer.CreditInfo#getCcNumber <em>Cc Number</em>}</li>
* <li>{@link org.eclipse.emf.test.models.customer.CreditInfo#getExpireDate <em>Expire Date</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.test.models.customer.CustomerPackage#getCreditInfo()
* @model extendedMetaData="name='creditInfo' kind='elementOnly'"
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/CustomerType.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/CustomerType.java
index a3014f637..d41055e02 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/CustomerType.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/CustomerType.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.models.customer.CustomerType#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.test.models.customer.CustomerType#getAddress <em>Address</em>}</li>
@@ -28,7 +29,6 @@ import org.eclipse.emf.ecore.EObject;
* <li>{@link org.eclipse.emf.test.models.customer.CustomerType#getPaymentDay <em>Payment Day</em>}</li>
* <li>{@link org.eclipse.emf.test.models.customer.CustomerType#getID <em>ID</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.test.models.customer.CustomerPackage#getCustomerType()
* @model extendedMetaData="name='dbcustomer' kind='elementOnly'"
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/CustomersType.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/CustomersType.java
index 069f16b7e..91a1f26ef 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/CustomersType.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/CustomersType.java
@@ -21,11 +21,11 @@ import org.eclipse.emf.ecore.util.FeatureMap;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.models.customer.CustomersType#getMixed <em>Mixed</em>}</li>
* <li>{@link org.eclipse.emf.test.models.customer.CustomersType#getCustomer <em>Customer</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.test.models.customer.CustomerPackage#getCustomersType()
* @model extendedMetaData="name='customersType' kind='mixed'"
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/DocumentRoot.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/DocumentRoot.java
index dede3e7f9..393c8482d 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/DocumentRoot.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/DocumentRoot.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.util.FeatureMap;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.models.customer.DocumentRoot#getMixed <em>Mixed</em>}</li>
* <li>{@link org.eclipse.emf.test.models.customer.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
@@ -28,7 +29,6 @@ import org.eclipse.emf.ecore.util.FeatureMap;
* <li>{@link org.eclipse.emf.test.models.customer.DocumentRoot#getCustomers <em>Customers</em>}</li>
* <li>{@link org.eclipse.emf.test.models.customer.DocumentRoot#getID <em>ID</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.test.models.customer.CustomerPackage#getDocumentRoot()
* @model extendedMetaData="name='' kind='mixed'"
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/USAddr.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/USAddr.java
index 953af92df..8f81d0eb1 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/USAddr.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/USAddr.java
@@ -18,11 +18,11 @@ package org.eclipse.emf.test.models.customer;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.models.customer.USAddr#getZip <em>Zip</em>}</li>
* <li>{@link org.eclipse.emf.test.models.customer.USAddr#getState <em>State</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.test.models.customer.CustomerPackage#getUSAddr()
* @model extendedMetaData="name='USAddr' kind='elementOnly'"
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/USState.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/USState.java
index 90ac5e2e6..c22a93cb5 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/USState.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/USState.java
@@ -128,6 +128,8 @@ public enum USState implements Enumerator
* Returns the '<em><b>US State</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 USState get(String literal)
@@ -147,6 +149,8 @@ public enum USState implements Enumerator
* Returns the '<em><b>US State</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 USState getByName(String name)
@@ -166,6 +170,8 @@ public enum USState implements Enumerator
* Returns the '<em><b>US State</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 USState get(int value)
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/AddressTypeImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/AddressTypeImpl.java
index d2b3bcaf5..e83148cf3 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/AddressTypeImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/AddressTypeImpl.java
@@ -23,11 +23,11 @@ import org.eclipse.emf.test.models.customer.CustomerPackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.models.customer.impl.AddressTypeImpl#getStreet <em>Street</em>}</li>
* <li>{@link org.eclipse.emf.test.models.customer.impl.AddressTypeImpl#getTown <em>Town</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CanadaAddrImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CanadaAddrImpl.java
index d8459af29..0726638a5 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CanadaAddrImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CanadaAddrImpl.java
@@ -22,11 +22,11 @@ import org.eclipse.emf.test.models.customer.CustomerPackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.models.customer.impl.CanadaAddrImpl#getZip <em>Zip</em>}</li>
* <li>{@link org.eclipse.emf.test.models.customer.impl.CanadaAddrImpl#getProvince <em>Province</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CreditInfoImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CreditInfoImpl.java
index bf20aa174..b34637b8e 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CreditInfoImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CreditInfoImpl.java
@@ -27,12 +27,12 @@ import org.eclipse.emf.test.models.customer.CustomerPackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.models.customer.impl.CreditInfoImpl#getHolder <em>Holder</em>}</li>
* <li>{@link org.eclipse.emf.test.models.customer.impl.CreditInfoImpl#getCcNumber <em>Cc Number</em>}</li>
* <li>{@link org.eclipse.emf.test.models.customer.impl.CreditInfoImpl#getExpireDate <em>Expire Date</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CustomerFactoryImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CustomerFactoryImpl.java
index 9efcccfc7..5350cc6dd 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CustomerFactoryImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CustomerFactoryImpl.java
@@ -49,7 +49,7 @@ public class CustomerFactoryImpl extends EFactoryImpl implements CustomerFactory
{
try
{
- CustomerFactory theCustomerFactory = (CustomerFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org.eclipse.emf.test.models/Customer");
+ CustomerFactory theCustomerFactory = (CustomerFactory)EPackage.Registry.INSTANCE.getEFactory(CustomerPackage.eNS_URI);
if (theCustomerFactory != null)
{
return theCustomerFactory;
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CustomerPackageImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CustomerPackageImpl.java
index 1a4fe3bed..ca8472573 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CustomerPackageImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CustomerPackageImpl.java
@@ -699,7 +699,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
*/
protected void createExtendedMetaDataAnnotations()
{
- String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
+ String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
addAnnotation
(addressTypeEClass,
source,
@@ -707,7 +707,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"name", "addressType",
"kind", "elementOnly"
- });
+ });
addAnnotation
(getAddressType_Street(),
source,
@@ -715,7 +715,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"kind", "element",
"name", "street"
- });
+ });
addAnnotation
(getAddressType_Town(),
source,
@@ -723,7 +723,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"kind", "element",
"name", "town"
- });
+ });
addAnnotation
(canadaAddrEClass,
source,
@@ -731,7 +731,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"name", "canadaAddr",
"kind", "elementOnly"
- });
+ });
addAnnotation
(getCanadaAddr_Zip(),
source,
@@ -739,7 +739,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"kind", "element",
"name", "zip"
- });
+ });
addAnnotation
(getCanadaAddr_Province(),
source,
@@ -747,7 +747,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"kind", "element",
"name", "province"
- });
+ });
addAnnotation
(creditInfoEClass,
source,
@@ -755,7 +755,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"name", "creditInfo",
"kind", "elementOnly"
- });
+ });
addAnnotation
(getCreditInfo_Holder(),
source,
@@ -763,7 +763,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"kind", "element",
"name", "holder"
- });
+ });
addAnnotation
(getCreditInfo_CcNumber(),
source,
@@ -771,7 +771,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"kind", "element",
"name", "cc_number"
- });
+ });
addAnnotation
(getCreditInfo_ExpireDate(),
source,
@@ -779,7 +779,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"kind", "element",
"name", "expireDate"
- });
+ });
addAnnotation
(customersTypeEClass,
source,
@@ -787,7 +787,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"name", "customersType",
"kind", "mixed"
- });
+ });
addAnnotation
(getCustomersType_Mixed(),
source,
@@ -795,7 +795,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"kind", "elementWildcard",
"name", ":mixed"
- });
+ });
addAnnotation
(getCustomersType_Customer(),
source,
@@ -804,7 +804,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
"kind", "element",
"name", "customer",
"namespace", "##targetNamespace"
- });
+ });
addAnnotation
(customerTypeEClass,
source,
@@ -812,7 +812,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"name", "dbcustomer",
"kind", "elementOnly"
- });
+ });
addAnnotation
(getCustomerType_Name(),
source,
@@ -820,7 +820,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"kind", "element",
"name", "name"
- });
+ });
addAnnotation
(getCustomerType_Address(),
source,
@@ -828,7 +828,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"kind", "element",
"name", "address"
- });
+ });
addAnnotation
(getCustomerType_CreditCard(),
source,
@@ -836,7 +836,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"kind", "element",
"name", "creditCard"
- });
+ });
addAnnotation
(getCustomerType_PaymentDay(),
source,
@@ -844,7 +844,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"kind", "element",
"name", "paymentDay"
- });
+ });
addAnnotation
(getCustomerType_ID(),
source,
@@ -853,7 +853,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
"kind", "attribute",
"name", "ID",
"namespace", "##targetNamespace"
- });
+ });
addAnnotation
(documentRootEClass,
source,
@@ -861,7 +861,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"name", "",
"kind", "mixed"
- });
+ });
addAnnotation
(getDocumentRoot_Mixed(),
source,
@@ -869,7 +869,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"kind", "elementWildcard",
"name", ":mixed"
- });
+ });
addAnnotation
(getDocumentRoot_XMLNSPrefixMap(),
source,
@@ -877,7 +877,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"kind", "attribute",
"name", "xmlns:prefix"
- });
+ });
addAnnotation
(getDocumentRoot_XSISchemaLocation(),
source,
@@ -885,7 +885,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"kind", "attribute",
"name", "xsi:schemaLocation"
- });
+ });
addAnnotation
(getDocumentRoot_Customers(),
source,
@@ -894,7 +894,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
"kind", "element",
"name", "customers",
"namespace", "##targetNamespace"
- });
+ });
addAnnotation
(getDocumentRoot_ID(),
source,
@@ -903,7 +903,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
"kind", "attribute",
"name", "ID",
"namespace", "##targetNamespace"
- });
+ });
addAnnotation
(usAddrEClass,
source,
@@ -911,7 +911,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"name", "USAddr",
"kind", "elementOnly"
- });
+ });
addAnnotation
(getUSAddr_Zip(),
source,
@@ -919,7 +919,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"kind", "element",
"name", "zip"
- });
+ });
addAnnotation
(getUSAddr_State(),
source,
@@ -927,14 +927,14 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"kind", "element",
"name", "state"
- });
+ });
addAnnotation
(usStateEEnum,
source,
new String[]
{
"name", "USState"
- });
+ });
addAnnotation
(usStateObjectEDataType,
source,
@@ -942,7 +942,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
{
"name", "USState:Object",
"baseType", "USState"
- });
+ });
addAnnotation
(zipCodesEDataType,
source,
@@ -952,7 +952,7 @@ public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage
"baseType", "http://www.eclipse.org/emf/2003/XMLType#integer",
"minInclusive", "10000",
"maxInclusive", "99999"
- });
+ });
addAnnotation
(zipUnionEDataType,
source,
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CustomerTypeImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CustomerTypeImpl.java
index e608115bd..4f2e88c19 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CustomerTypeImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CustomerTypeImpl.java
@@ -29,6 +29,7 @@ import org.eclipse.emf.test.models.customer.CustomerType;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.models.customer.impl.CustomerTypeImpl#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.test.models.customer.impl.CustomerTypeImpl#getAddress <em>Address</em>}</li>
@@ -36,7 +37,6 @@ import org.eclipse.emf.test.models.customer.CustomerType;
* <li>{@link org.eclipse.emf.test.models.customer.impl.CustomerTypeImpl#getPaymentDay <em>Payment Day</em>}</li>
* <li>{@link org.eclipse.emf.test.models.customer.impl.CustomerTypeImpl#getID <em>ID</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CustomersTypeImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CustomersTypeImpl.java
index 3c3e5ea68..0cb280d75 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CustomersTypeImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CustomersTypeImpl.java
@@ -30,11 +30,11 @@ import org.eclipse.emf.test.models.customer.CustomersType;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.models.customer.impl.CustomersTypeImpl#getMixed <em>Mixed</em>}</li>
* <li>{@link org.eclipse.emf.test.models.customer.impl.CustomersTypeImpl#getCustomer <em>Customer</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/DocumentRootImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/DocumentRootImpl.java
index bdf18f6f6..1c4ae2290 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/DocumentRootImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/DocumentRootImpl.java
@@ -34,6 +34,7 @@ import org.eclipse.emf.test.models.customer.DocumentRoot;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.models.customer.impl.DocumentRootImpl#getMixed <em>Mixed</em>}</li>
* <li>{@link org.eclipse.emf.test.models.customer.impl.DocumentRootImpl#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
@@ -41,7 +42,6 @@ import org.eclipse.emf.test.models.customer.DocumentRoot;
* <li>{@link org.eclipse.emf.test.models.customer.impl.DocumentRootImpl#getCustomers <em>Customers</em>}</li>
* <li>{@link org.eclipse.emf.test.models.customer.impl.DocumentRootImpl#getID <em>ID</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/USAddrImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/USAddrImpl.java
index dfd2b6714..bc2b7b60f 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/USAddrImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/USAddrImpl.java
@@ -22,11 +22,11 @@ import org.eclipse.emf.test.models.customer.USAddr;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.models.customer.impl.USAddrImpl#getZip <em>Zip</em>}</li>
* <li>{@link org.eclipse.emf.test.models.customer.impl.USAddrImpl#getState <em>State</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/util/CustomerSwitch.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/util/CustomerSwitch.java
index 6d09905eb..f1745f94a 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/util/CustomerSwitch.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/util/CustomerSwitch.java
@@ -10,10 +10,9 @@
*/
package org.eclipse.emf.test.models.customer.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.customer.AddressType;
import org.eclipse.emf.test.models.customer.CanadaAddr;
import org.eclipse.emf.test.models.customer.CreditInfo;
@@ -36,7 +35,7 @@ import org.eclipse.emf.test.models.customer.USAddr;
* @see org.eclipse.emf.test.models.customer.CustomerPackage
* @generated
*/
-public class CustomerSwitch<T>
+public class CustomerSwitch<T> extends Switch<T>
{
/**
* The cached model package
@@ -61,38 +60,17 @@ public class CustomerSwitch<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;
}
/**
@@ -102,6 +80,7 @@ public class CustomerSwitch<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)
@@ -284,6 +263,7 @@ public class CustomerSwitch<T>
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
*/
+ @Override
public T defaultCase(EObject object)
{
return null;
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/DbType.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/DbType.java
index 6110aedc8..38ae52754 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/DbType.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/DbType.java
@@ -21,13 +21,13 @@ import org.eclipse.emf.test.models.dbprice.PencilType;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.models.dbitem.DbType#getRedPen <em>Red Pen</em>}</li>
* <li>{@link org.eclipse.emf.test.models.dbitem.DbType#getBluePen <em>Blue Pen</em>}</li>
* <li>{@link org.eclipse.emf.test.models.dbitem.DbType#getRedPencil <em>Red Pencil</em>}</li>
* <li>{@link org.eclipse.emf.test.models.dbitem.DbType#getBluePencil <em>Blue Pencil</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.test.models.dbitem.DBItemPackage#getDbType()
* @model extendedMetaData="name='dbType' kind='elementOnly'"
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/DocumentRoot.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/DocumentRoot.java
index efb1f41b2..ed074ef8d 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/DocumentRoot.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/DocumentRoot.java
@@ -21,13 +21,13 @@ import org.eclipse.emf.ecore.util.FeatureMap;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.models.dbitem.DocumentRoot#getMixed <em>Mixed</em>}</li>
* <li>{@link org.eclipse.emf.test.models.dbitem.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
* <li>{@link org.eclipse.emf.test.models.dbitem.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
* <li>{@link org.eclipse.emf.test.models.dbitem.DocumentRoot#getDbitem <em>Dbitem</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.test.models.dbitem.DBItemPackage#getDocumentRoot()
* @model extendedMetaData="name='' kind='mixed'"
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/impl/DBItemFactoryImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/impl/DBItemFactoryImpl.java
index 169a07b31..9393184e1 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/impl/DBItemFactoryImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/impl/DBItemFactoryImpl.java
@@ -38,7 +38,7 @@ public class DBItemFactoryImpl extends EFactoryImpl implements DBItemFactory
{
try
{
- DBItemFactory theDBItemFactory = (DBItemFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org.eclipse.emf.test.models/dbitem");
+ DBItemFactory theDBItemFactory = (DBItemFactory)EPackage.Registry.INSTANCE.getEFactory(DBItemPackage.eNS_URI);
if (theDBItemFactory != null)
{
return theDBItemFactory;
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/impl/DBItemPackageImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/impl/DBItemPackageImpl.java
index b3c0380ac..3e62dbaf1 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/impl/DBItemPackageImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/impl/DBItemPackageImpl.java
@@ -317,7 +317,7 @@ public class DBItemPackageImpl extends EPackageImpl implements DBItemPackage
*/
protected void createExtendedMetaDataAnnotations()
{
- String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
+ String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
addAnnotation
(dbTypeEClass,
source,
@@ -325,7 +325,7 @@ public class DBItemPackageImpl extends EPackageImpl implements DBItemPackage
{
"name", "dbType",
"kind", "elementOnly"
- });
+ });
addAnnotation
(getDbType_RedPen(),
source,
@@ -334,7 +334,7 @@ public class DBItemPackageImpl extends EPackageImpl implements DBItemPackage
"kind", "element",
"name", "red_pen",
"namespace", "##targetNamespace"
- });
+ });
addAnnotation
(getDbType_BluePen(),
source,
@@ -342,7 +342,7 @@ public class DBItemPackageImpl extends EPackageImpl implements DBItemPackage
{
"kind", "element",
"name", "blue_pen"
- });
+ });
addAnnotation
(getDbType_RedPencil(),
source,
@@ -351,7 +351,7 @@ public class DBItemPackageImpl extends EPackageImpl implements DBItemPackage
"kind", "element",
"name", "red_pencil",
"namespace", "##targetNamespace"
- });
+ });
addAnnotation
(getDbType_BluePencil(),
source,
@@ -359,7 +359,7 @@ public class DBItemPackageImpl extends EPackageImpl implements DBItemPackage
{
"kind", "element",
"name", "blue_pencil"
- });
+ });
addAnnotation
(documentRootEClass,
source,
@@ -367,7 +367,7 @@ public class DBItemPackageImpl extends EPackageImpl implements DBItemPackage
{
"name", "",
"kind", "mixed"
- });
+ });
addAnnotation
(getDocumentRoot_Mixed(),
source,
@@ -375,7 +375,7 @@ public class DBItemPackageImpl extends EPackageImpl implements DBItemPackage
{
"kind", "elementWildcard",
"name", ":mixed"
- });
+ });
addAnnotation
(getDocumentRoot_XMLNSPrefixMap(),
source,
@@ -383,7 +383,7 @@ public class DBItemPackageImpl extends EPackageImpl implements DBItemPackage
{
"kind", "attribute",
"name", "xmlns:prefix"
- });
+ });
addAnnotation
(getDocumentRoot_XSISchemaLocation(),
source,
@@ -391,7 +391,7 @@ public class DBItemPackageImpl extends EPackageImpl implements DBItemPackage
{
"kind", "attribute",
"name", "xsi:schemaLocation"
- });
+ });
addAnnotation
(getDocumentRoot_Dbitem(),
source,
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/impl/DbTypeImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/impl/DbTypeImpl.java
index 6c18203d9..1670989ff 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/impl/DbTypeImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/impl/DbTypeImpl.java
@@ -27,13 +27,13 @@ import org.eclipse.emf.test.models.dbprice.PencilType;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.models.dbitem.impl.DbTypeImpl#getRedPen <em>Red Pen</em>}</li>
* <li>{@link org.eclipse.emf.test.models.dbitem.impl.DbTypeImpl#getBluePen <em>Blue Pen</em>}</li>
* <li>{@link org.eclipse.emf.test.models.dbitem.impl.DbTypeImpl#getRedPencil <em>Red Pencil</em>}</li>
* <li>{@link org.eclipse.emf.test.models.dbitem.impl.DbTypeImpl#getBluePencil <em>Blue Pencil</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/impl/DocumentRootImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/impl/DocumentRootImpl.java
index 4706bcccd..41a02de1f 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/impl/DocumentRootImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/impl/DocumentRootImpl.java
@@ -32,13 +32,13 @@ import org.eclipse.emf.test.models.dbitem.DocumentRoot;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.models.dbitem.impl.DocumentRootImpl#getMixed <em>Mixed</em>}</li>
* <li>{@link org.eclipse.emf.test.models.dbitem.impl.DocumentRootImpl#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
* <li>{@link org.eclipse.emf.test.models.dbitem.impl.DocumentRootImpl#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
* <li>{@link org.eclipse.emf.test.models.dbitem.impl.DocumentRootImpl#getDbitem <em>Dbitem</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/util/DBItemSwitch.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/util/DBItemSwitch.java
index 88d0c627d..499d4c743 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/util/DBItemSwitch.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/util/DBItemSwitch.java
@@ -10,10 +10,9 @@
*/
package org.eclipse.emf.test.models.dbitem.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.dbitem.DBItemPackage;
import org.eclipse.emf.test.models.dbitem.DbType;
import org.eclipse.emf.test.models.dbitem.DocumentRoot;
@@ -31,7 +30,7 @@ import org.eclipse.emf.test.models.dbitem.DocumentRoot;
* @see org.eclipse.emf.test.models.dbitem.DBItemPackage
* @generated
*/
-public class DBItemSwitch<T>
+public class DBItemSwitch<T> extends Switch<T>
{
/**
* The cached model package
@@ -56,38 +55,17 @@ public class DBItemSwitch<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;
}
/**
@@ -97,6 +75,7 @@ public class DBItemSwitch<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)
@@ -162,6 +141,7 @@ public class DBItemSwitch<T>
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
*/
+ @Override
public T defaultCase(EObject object)
{
return null;
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/PenType.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/PenType.java
index ef1f98193..00842cf68 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/PenType.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/PenType.java
@@ -19,10 +19,10 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.models.dbprice.PenType#getPrice <em>Price</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.test.models.dbprice.DBPricePackage#getPenType()
* @model extendedMetaData="name='penType' kind='elementOnly'"
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/PencilType.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/PencilType.java
index cf5309961..57c52250d 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/PencilType.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/PencilType.java
@@ -19,10 +19,10 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.models.dbprice.PencilType#getPrice <em>Price</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.test.models.dbprice.DBPricePackage#getPencilType()
* @model extendedMetaData="name='pencilType' kind='elementOnly'"
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/impl/DBPriceFactoryImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/impl/DBPriceFactoryImpl.java
index 0f3dc7cfb..cae2c7f5d 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/impl/DBPriceFactoryImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/impl/DBPriceFactoryImpl.java
@@ -38,7 +38,7 @@ public class DBPriceFactoryImpl extends EFactoryImpl implements DBPriceFactory
{
try
{
- DBPriceFactory theDBPriceFactory = (DBPriceFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org.eclipse.emf.test.models/dbprice");
+ DBPriceFactory theDBPriceFactory = (DBPriceFactory)EPackage.Registry.INSTANCE.getEFactory(DBPricePackage.eNS_URI);
if (theDBPriceFactory != null)
{
return theDBPriceFactory;
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/impl/DBPricePackageImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/impl/DBPricePackageImpl.java
index a07ac1976..c47119e19 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/impl/DBPricePackageImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/impl/DBPricePackageImpl.java
@@ -248,7 +248,7 @@ public class DBPricePackageImpl extends EPackageImpl implements DBPricePackage
*/
protected void createExtendedMetaDataAnnotations()
{
- String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
+ String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
addAnnotation
(pencilTypeEClass,
source,
@@ -256,7 +256,7 @@ public class DBPricePackageImpl extends EPackageImpl implements DBPricePackage
{
"name", "pencilType",
"kind", "elementOnly"
- });
+ });
addAnnotation
(getPencilType_Price(),
source,
@@ -264,7 +264,7 @@ public class DBPricePackageImpl extends EPackageImpl implements DBPricePackage
{
"kind", "element",
"name", "price"
- });
+ });
addAnnotation
(penTypeEClass,
source,
@@ -272,7 +272,7 @@ public class DBPricePackageImpl extends EPackageImpl implements DBPricePackage
{
"name", "penType",
"kind", "elementOnly"
- });
+ });
addAnnotation
(getPenType_Price(),
source,
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/impl/PenTypeImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/impl/PenTypeImpl.java
index a863ebd71..e31506f1d 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/impl/PenTypeImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/impl/PenTypeImpl.java
@@ -23,10 +23,10 @@ import org.eclipse.emf.test.models.dbprice.PenType;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.models.dbprice.impl.PenTypeImpl#getPrice <em>Price</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/impl/PencilTypeImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/impl/PencilTypeImpl.java
index 98808370b..f202ce669 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/impl/PencilTypeImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/impl/PencilTypeImpl.java
@@ -23,10 +23,10 @@ import org.eclipse.emf.test.models.dbprice.PencilType;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.models.dbprice.impl.PencilTypeImpl#getPrice <em>Price</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/util/DBPriceSwitch.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/util/DBPriceSwitch.java
index c27ecbc1d..a5ed655fd 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/util/DBPriceSwitch.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/util/DBPriceSwitch.java
@@ -10,10 +10,9 @@
*/
package org.eclipse.emf.test.models.dbprice.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.dbprice.DBPricePackage;
import org.eclipse.emf.test.models.dbprice.PenType;
import org.eclipse.emf.test.models.dbprice.PencilType;
@@ -31,7 +30,7 @@ import org.eclipse.emf.test.models.dbprice.PencilType;
* @see org.eclipse.emf.test.models.dbprice.DBPricePackage
* @generated
*/
-public class DBPriceSwitch<T>
+public class DBPriceSwitch<T> extends Switch<T>
{
/**
* The cached model package
@@ -56,38 +55,17 @@ public class DBPriceSwitch<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;
}
/**
@@ -97,6 +75,7 @@ public class DBPriceSwitch<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)
@@ -162,6 +141,7 @@ public class DBPriceSwitch<T>
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
*/
+ @Override
public T defaultCase(EObject object)
{
return null;
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/ExtE.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/ExtE.java
index 2b1582b18..b175ebb57 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/ExtE.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/ExtE.java
@@ -20,11 +20,11 @@ import org.eclipse.emf.test.models.ref.E;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.models.ext.ExtE#getValue <em>Value</em>}</li>
* <li>{@link org.eclipse.emf.test.models.ext.ExtE#getF <em>F</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.test.models.ext.ExtPackage#getExtE()
* @model
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/F.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/F.java
index a7d87c61a..64970e274 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/F.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/F.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.ext.F#getId <em>Id</em>}</li>
* <li>{@link org.eclipse.emf.test.models.ext.F#getE <em>E</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.test.models.ext.ExtPackage#getF()
* @model
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/impl/ExtEImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/impl/ExtEImpl.java
index 0d79125c1..701336aa5 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/impl/ExtEImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/impl/ExtEImpl.java
@@ -31,11 +31,11 @@ import org.eclipse.emf.test.models.ref.impl.EImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.models.ext.impl.ExtEImpl#getValue <em>Value</em>}</li>
* <li>{@link org.eclipse.emf.test.models.ext.impl.ExtEImpl#getF <em>F</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/impl/ExtFactoryImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/impl/ExtFactoryImpl.java
index f3630081b..e80fed2bb 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/impl/ExtFactoryImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/impl/ExtFactoryImpl.java
@@ -38,7 +38,7 @@ public class ExtFactoryImpl extends EFactoryImpl implements ExtFactory
{
try
{
- ExtFactory theExtFactory = (ExtFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org.eclipse.emf.test.models/ext");
+ ExtFactory theExtFactory = (ExtFactory)EPackage.Registry.INSTANCE.getEFactory(ExtPackage.eNS_URI);
if (theExtFactory != null)
{
return theExtFactory;
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/impl/FImpl.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/impl/FImpl.java
index fd7d346b8..3dfd0b106 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/impl/FImpl.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/impl/FImpl.java
@@ -27,11 +27,11 @@ import org.eclipse.emf.test.models.ext.F;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.test.models.ext.impl.FImpl#getId <em>Id</em>}</li>
* <li>{@link org.eclipse.emf.test.models.ext.impl.FImpl#getE <em>E</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
@@ -109,7 +109,7 @@ public class FImpl extends EObjectImpl implements F
public ExtE getE()
{
if (eContainerFeatureID() != ExtPackage.F__E) return null;
- return (ExtE)eContainer();
+ return (ExtE)eInternalContainer();
}
/**
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/provider/ExtEItemProvider.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/provider/ExtEItemProvider.java
index b19d99892..dc7e0b0ca 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/provider/ExtEItemProvider.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/provider/ExtEItemProvider.java
@@ -19,12 +19,7 @@ import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.ResourceLocator;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.emf.test.models.ext.ExtE;
@@ -40,13 +35,7 @@ import org.eclipse.emf.test.models.ref.provider.RefTestEditPlugin;
* @generated
*/
public class ExtEItemProvider
- extends EItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
+ extends EItemProvider
{
/**
* This constructs an instance from a factory and a notifier.
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/util/ExtSwitch.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/util/ExtSwitch.java
index 5233c7955..c5ba46737 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/util/ExtSwitch.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/util/ExtSwitch.java
@@ -10,10 +10,9 @@
*/
package org.eclipse.emf.test.models.ext.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.ext.ExtE;
import org.eclipse.emf.test.models.ext.ExtPackage;
import org.eclipse.emf.test.models.ext.F;
@@ -32,7 +31,7 @@ import org.eclipse.emf.test.models.ref.E;
* @see org.eclipse.emf.test.models.ext.ExtPackage
* @generated
*/
-public class ExtSwitch<T>
+public class ExtSwitch<T> extends Switch<T>
{
/**
* The cached model package
@@ -57,38 +56,17 @@ public class ExtSwitch<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.