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 /examples
parent5ce762d2b21c17b9ff4e9e7f8eae8cf038f3c9f8 (diff)
downloadorg.eclipse.emf-1437f0b2ce8651a0566aaed6caaa5e1012c7cb51.tar.gz
org.eclipse.emf-1437f0b2ce8651a0566aaed6caaa5e1012c7cb51.tar.xz
org.eclipse.emf-1437f0b2ce8651a0566aaed6caaa5e1012c7cb51.zip
[434699] Regenerate models
Diffstat (limited to 'examples')
-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
88 files changed, 249 insertions, 438 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;

Back to the top