summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2008-04-07 04:36:49 (EDT)
committerEike Stepper2008-04-07 04:36:49 (EDT)
commitf51a8665a700e81db7ebc092bbbc6005f84831fb (patch)
tree7b32b17163ff28df6583500fbc9a93c162f8743d
parent0d0da313023148b4e977bd282d5b1074a0607f78 (diff)
downloadcdo-f51a8665a700e81db7ebc092bbbc6005f84831fb.zip
cdo-f51a8665a700e81db7ebc092bbbc6005f84831fb.tar.gz
cdo-f51a8665a700e81db7ebc092bbbc6005f84831fb.tar.bz2
Regenerated for latest EMF 2.4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/model/editor.genmodel2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java13
2 files changed, 12 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/model/editor.genmodel b/plugins/org.eclipse.emf.cdo.ui/model/editor.genmodel
index 60fd3ed..37af764 100644
--- a/plugins/org.eclipse.emf.cdo.ui/model/editor.genmodel
+++ b/plugins/org.eclipse.emf.cdo.ui/model/editor.genmodel
@@ -8,7 +8,7 @@
<foreignModel>editor.ecore</foreignModel>
<genPackages prefix="CDO" basePackage="org.eclipse.emf.cdo.internal.ui" disposableProviderFactory="true"
presentationPackageSuffix="" multipleEditorPages="false" generateModelWizard="false"
- ecorePackage="editor.ecore#/">
+ extensibleProviderFactory="true" childCreationExtenders="true" ecorePackage="editor.ecore#/">
<genClasses ecoreClass="editor.ecore#//Dummy"/>
</genPackages>
</genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
index 16a408e..4225f9d 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
@@ -566,6 +566,10 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
{
if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict()))
{
+ if (isDirty())
+ {
+ changedResources.addAll(editingDomain.getResourceSet().getResources());
+ }
editingDomain.getCommandStack().flush();
updateProblemIndication = false;
@@ -587,6 +591,12 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
}
}
}
+
+ if (AdapterFactoryEditingDomain.isStale(editorSelection))
+ {
+ setSelection(StructuredSelection.EMPTY);
+ }
+
updateProblemIndication = true;
updateProblemIndication();
}
@@ -1081,8 +1091,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
// Only creates the other pages if there is something that can be edited
//
- if (!getEditingDomain().getResourceSet().getResources().isEmpty()
- && !getEditingDomain().getResourceSet().getResources().get(0).getContents().isEmpty())
+ if (!getEditingDomain().getResourceSet().getResources().isEmpty())
{
// Create a page for the selection tree view.
//