Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Fluegge2010-10-08 16:50:42 +0000
committerMartin Fluegge2010-10-08 16:50:42 +0000
commit01700460fd91df78dc01bd6f026f7077fe98fa5a (patch)
treee6ba381e5d16f66d0ae28ee41d2d65c43f4ce0f1 /plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn
parent7bfe12fe5466a6f34e467252dcac8839ac3f1e4e (diff)
downloadcdo-01700460fd91df78dc01bd6f026f7077fe98fa5a.tar.gz
cdo-01700460fd91df78dc01bd6f026f7077fe98fa5a.tar.xz
cdo-01700460fd91df78dc01bd6f026f7077fe98fa5a.zip
[323828] [Dawn] Provide collaborative EMF editors on CDO
https://bugs.eclipse.org/bugs/show_bug.cgi?id=323828
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/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreEditor.java21
1 files changed, 8 insertions, 13 deletions
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 0990ce0b97..5d75d64db3 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
@@ -45,7 +45,6 @@ public class DawnAcoreEditor extends AcoreEditor implements IDawnEditor
public DawnAcoreEditor()
{
super();
- System.out.println("Using Dawn Acore Editor");
dawnEditorSupport = new DawnEMFEditorSupport(this);
}
@@ -53,8 +52,11 @@ public class DawnAcoreEditor extends AcoreEditor implements IDawnEditor
protected void setInput(IEditorInput input)
{
super.setInput(input);
- dawnEditorSupport.setView(((DawnEditorInput)input).getView());
- dawnEditorSupport.registerListeners();
+ if (input instanceof DawnEditorInput)
+ {
+ dawnEditorSupport.setView(((DawnEditorInput)input).getView());
+ dawnEditorSupport.registerListeners();
+ }
}
@Override
@@ -80,10 +82,9 @@ public class DawnAcoreEditor extends AcoreEditor implements IDawnEditor
}
((DawnEditorInput)input).setResource(resource);
+ dawnEditorSupport.setView(((DawnEditorInput)input).getView());
+ dawnEditorSupport.registerListeners();
}
-
- dawnEditorSupport.setView(((DawnEditorInput)input).getView());
- dawnEditorSupport.registerListeners();
}
@Override
@@ -144,12 +145,6 @@ public class DawnAcoreEditor extends AcoreEditor implements IDawnEditor
dawnEditorSupport.setDirty(true);
}
- // @Override
- // public boolean isDirty()
- // {
- // return dawnEditorSupport.isDirty() || super.isDirty();
- // }
-
@Override
public void dispose()
{
@@ -165,7 +160,7 @@ public class DawnAcoreEditor extends AcoreEditor implements IDawnEditor
public String getContributorId()
{
- return null;
+ return ID;
}
public IDawnEditorSupport getDawnEditorSupport()

Back to the top