Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2013-02-06 14:50:23 +0000
committerChristian W. Damus2013-02-14 03:09:27 +0000
commit750741efc76f41ac099f1bdfde31a522180ceca7 (patch)
tree0663147c898702d32ab00d560c56295a2c2c49fe /plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn
parentc57bf7e84145be55a5e4c54ed06c93203d5bf22a (diff)
downloadcdo-750741efc76f41ac099f1bdfde31a522180ceca7.tar.gz
cdo-750741efc76f41ac099f1bdfde31a522180ceca7.tar.xz
cdo-750741efc76f41ac099f1bdfde31a522180ceca7.zip
[399933] Ecore model wizard crashdrops/I20130215-0410
https://bugs.eclipse.org/bugs/show_bug.cgi?id=399933
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn')
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreEditor.java9
2 files changed, 11 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/META-INF/MANIFEST.MF
index 2e4b49801c..03a6277e99 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.200.qualifier
Bundle-Localization: fragment
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
@@ -12,4 +12,4 @@ Require-Bundle: org.eclipse.emf.cdo.dawn;bundle-version="[2.0.0,3.0.0)",
org.eclipse.emf.cdo.dawn.util;bundle-version="[2.0.0,3.0.0)",
org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)",
org.eclipse.emf.cdo.dawn.emf;bundle-version="[2.0.0,3.0.0)"
-Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.presentation;version="1.0.0"
+Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.presentation;version="1.0.200"
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreEditor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreEditor.java
index 8057d8e05f..925207f33f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreEditor.java
@@ -7,6 +7,7 @@
*
* Contributors:
* Martin Fluegge - initial API and implementation
+ * Christian W. Damus (CEA) - bug 399933 NPE in editor when finishing Ecore wizard
*
*/
package org.eclipse.emf.cdo.dawn.examples.acore.presentation;
@@ -92,6 +93,11 @@ public class DawnAcoreEditor extends AcoreEditor implements IDawnEditor
{
super.createPages();
+ if (!(getEditorInput() instanceof DawnEditorInput))
+ {
+ return;
+ }
+
selectionViewer.setContentProvider(new DawnSelectionViewerAdapterFactoryContentProvider(adapterFactory,
((DawnEditorInput)getEditorInput()).getResource()));
selectionViewer
@@ -128,6 +134,9 @@ public class DawnAcoreEditor extends AcoreEditor implements IDawnEditor
super.doSave(progressMonitor);
}
}
+ {
+ super.doSave(progressMonitor);
+ }
}
public String getContributorID()

Back to the top