Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Merks2019-03-26 10:24:12 +0000
committerEd Merks2019-03-26 10:24:12 +0000
commite64ae760d80cde7888e8abe96ec26af58f88d9fc (patch)
tree5b14ad12c319a39fcbcda0da92dbe48e8bdb838c /examples
parent86d672c1752ffcc70ae80c83cd7f96dcac648d00 (diff)
downloadorg.eclipse.emf-e64ae760d80cde7888e8abe96ec26af58f88d9fc.tar.gz
org.eclipse.emf-e64ae760d80cde7888e8abe96ec26af58f88d9fc.tar.xz
org.eclipse.emf-e64ae760d80cde7888e8abe96ec26af58f88d9fc.zip
[releng] Ensure that examples still compile against Helios
Diffstat (limited to 'examples')
-rw-r--r--examples/org.eclipse.emf.examples.library.editor/src/org/eclipse/emf/examples/extlibrary/presentation/EXTLibraryEditor.java9
-rw-r--r--examples/org.eclipse.emf.examples.library/model/extlibrary.genmodel12
-rw-r--r--examples/org.eclipse.emf.java.editor/src/org/eclipse/emf/java/presentation/JavaEditor.java9
-rw-r--r--examples/org.eclipse.emf.java/model/Java.genmodel12
4 files changed, 20 insertions, 22 deletions
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 0d92908de..a7e283a2d 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
@@ -1468,20 +1468,21 @@ public class EXTLibraryEditor extends MultiPageEditorPart
* <!-- end-user-doc -->
* @generated
*/
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
- public <T> T getAdapter(Class<T> key)
+ public Object getAdapter(Class key)
{
if (key.equals(IContentOutlinePage.class))
{
- return showOutlineView() ? key.cast(getContentOutlinePage()) : null;
+ return showOutlineView() ? getContentOutlinePage() : null;
}
else if (key.equals(IPropertySheetPage.class))
{
- return key.cast(getPropertySheetPage());
+ return getPropertySheetPage();
}
else if (key.equals(IGotoMarker.class))
{
- return key.cast(this);
+ return this;
}
else
{
diff --git a/examples/org.eclipse.emf.examples.library/model/extlibrary.genmodel b/examples/org.eclipse.emf.examples.library/model/extlibrary.genmodel
index 13c415d55..5da8b8191 100644
--- a/examples/org.eclipse.emf.examples.library/model/extlibrary.genmodel
+++ b/examples/org.eclipse.emf.examples.library/model/extlibrary.genmodel
@@ -1,14 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.examples.library/src"
- editDirectory="/org.eclipse.emf.examples.library.edit/src" editorDirectory="/org.eclipse.emf.examples.library.editor/src"
- modelPluginID="org.eclipse.emf.examples.library" runtimeJar="true" modelName="EXTLibrary"
- editPluginClass="org.eclipse.emf.examples.extlibrary.provider.EXTLibraryEditPlugin"
+<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.library/src" editDirectory="/org.eclipse.emf.examples.library.edit/src"
+ editorDirectory="/org.eclipse.emf.examples.library.editor/src" modelPluginID="org.eclipse.emf.examples.library"
+ runtimeJar="true" modelName="EXTLibrary" editPluginClass="org.eclipse.emf.examples.extlibrary.provider.EXTLibraryEditPlugin"
editorPluginClass="org.eclipse.emf.examples.extlibrary.presentation.EXTLibraryEditorPlugin"
nonNLSMarkers="true" testsDirectory="" booleanFlagsField="eFlags" booleanFlagsReservedBits="8"
importerID="org.eclipse.emf.importer.ecore" containmentProxies="true" complianceLevel="5.0"
- language="en">
+ language="en" eclipsePlatformVersion="Juno">
<foreignModel>extlibrary.ecore</foreignModel>
<genPackages prefix="EXTLibrary" basePackage="org.eclipse.emf.examples" disposableProviderFactory="true"
contentTypeIdentifier="extendedLibrary" ecorePackage="extlibrary.ecore#/">
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 cfdceb8d6..add0aa785 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
@@ -1539,20 +1539,21 @@ public class JavaEditor
* <!-- end-user-doc -->
* @generated
*/
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
- public <T> T getAdapter(Class<T> key)
+ public Object getAdapter(Class key)
{
if (key.equals(IContentOutlinePage.class))
{
- return showOutlineView() ? key.cast(getContentOutlinePage()) : null;
+ return showOutlineView() ? getContentOutlinePage() : null;
}
else if (key.equals(IPropertySheetPage.class))
{
- return key.cast(getPropertySheetPage());
+ return getPropertySheetPage();
}
else if (key.equals(IGotoMarker.class))
{
- return key.cast(this);
+ return this;
}
else
{
diff --git a/examples/org.eclipse.emf.java/model/Java.genmodel b/examples/org.eclipse.emf.java/model/Java.genmodel
index 3879470ac..9008c7b46 100644
--- a/examples/org.eclipse.emf.java/model/Java.genmodel
+++ b/examples/org.eclipse.emf.java/model/Java.genmodel
@@ -1,11 +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"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.java/src"
- creationCommands="false" modelPluginID="org.eclipse.emf.java" runtimeJar="true"
- modelName="Java" modelPluginClass="org.eclipse.emf.java.JavaPlugin" updateClasspath="false"
- testsDirectory="" importerID="org.eclipse.emf.importer.rose" complianceLevel="5.0"
- language="en">
+<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.java/src" creationCommands="false"
+ modelPluginID="org.eclipse.emf.java" runtimeJar="true" modelName="Java" modelPluginClass="org.eclipse.emf.java.JavaPlugin"
+ updateClasspath="false" testsDirectory="" importerID="org.eclipse.emf.importer.rose"
+ complianceLevel="5.0" language="en" eclipsePlatformVersion="Juno">
<foreignModel>Java.mdl</foreignModel>
<foreignModel>VABASE_PLUGINS_PATH</foreignModel>
<foreignModel>../..</foreignModel>

Back to the top