[323828] [Dawn] Provide collaborative EMF editors on CDO

https://bugs.eclipse.org/bugs/show_bug.cgi?id=323828

3 files changed, 23 insertions, 23 deletions

diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelActionBarContributor.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelActionBarContributor.java
index 38f1c9cfda..a95f552b29 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelActionBarContributor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelActionBarContributor.java
@@ -77,8 +77,8 @@ public class DawngenmodelActionBarContributor extends EditingDomainActionBarCont
    * 
    * @generated
    */
-  protected IAction showPropertiesViewAction = new Action(DawnCodeGenEditorPlugin.INSTANCE
-      .getString("_UI_ShowPropertiesView_menu_item"))
+  protected IAction showPropertiesViewAction = new Action(
+      DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item"))
   {
     @Override
     public void run()
@@ -100,8 +100,8 @@ public class DawngenmodelActionBarContributor extends EditingDomainActionBarCont
    * 
    * @generated
    */
-  protected IAction refreshViewerAction = new Action(DawnCodeGenEditorPlugin.INSTANCE
-      .getString("_UI_RefreshViewer_menu_item"))
+  protected IAction refreshViewerAction = new Action(
+      DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item"))
   {
     @Override
     public boolean isEnabled()
@@ -191,8 +191,9 @@ public class DawngenmodelActionBarContributor extends EditingDomainActionBarCont
   {
     super.contributeToMenu(menuManager);
 
-    IMenuManager submenuManager = new MenuManager(DawnCodeGenEditorPlugin.INSTANCE
-        .getString("_UI_DawngenmodelEditor_menu"), "org.eclipse.emf.cdo.dawn.codegen.dawngenmodelMenuID");
+    IMenuManager submenuManager = new MenuManager(
+        DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawngenmodelEditor_menu"),
+        "org.eclipse.emf.cdo.dawn.codegen.dawngenmodelMenuID");
     menuManager.insertAfter("additions", submenuManager);
     submenuManager.add(new Separator("settings"));
     submenuManager.add(new Separator("actions"));
@@ -206,8 +207,8 @@ public class DawngenmodelActionBarContributor extends EditingDomainActionBarCont
 
     // Prepare for CreateSibling item addition or removal.
     //
-    createSiblingMenuManager = new MenuManager(DawnCodeGenEditorPlugin.INSTANCE
-        .getString("_UI_CreateSibling_menu_item"));
+    createSiblingMenuManager = new MenuManager(
+        DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
     submenuManager.insertBefore("additions", createSiblingMenuManager);
 
     // Force an update because Eclipse hides empty menus now.
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelEditor.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelEditor.java
index f2a4abcb4c..26f36d308c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelEditor.java
@@ -459,8 +459,8 @@ public class DawngenmodelEditor extends MultiPageEditorPart implements IEditingD
               if (delta.getKind() == IResourceDelta.REMOVED || delta.getKind() == IResourceDelta.CHANGED
                   && delta.getFlags() != IResourceDelta.MARKERS)
               {
-                Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath()
-                    .toString(), true), false);
+                Resource resource = resourceSet.getResource(
+                    URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
                 if (resource != null)
                 {
                   if (delta.getKind() == IResourceDelta.REMOVED)
@@ -625,8 +625,8 @@ public class DawngenmodelEditor extends MultiPageEditorPart implements IEditingD
     if (updateProblemIndication)
     {
       BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK,
-          "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor", 0, null, new Object[] { editingDomain
-              .getResourceSet() });
+          "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor", 0, null,
+          new Object[] { editingDomain.getResourceSet() });
       for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values())
       {
         if (childDiagnostic.getSeverity() != Diagnostic.OK)
@@ -1017,8 +1017,8 @@ public class DawngenmodelEditor extends MultiPageEditorPart implements IEditingD
     if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty())
     {
       BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR,
-          "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor", 0, getString("_UI_CreateModelError_message", resource
-              .getURI()), new Object[] { exception == null ? (Object)resource : exception });
+          "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor", 0, getString("_UI_CreateModelError_message",
+              resource.getURI()), new Object[] { exception == null ? (Object)resource : exception });
       basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
       return basicDiagnostic;
     }
@@ -1689,7 +1689,7 @@ public class DawngenmodelEditor extends MultiPageEditorPart implements IEditingD
    */
   protected void doSaveAs(URI uri, IEditorInput editorInput)
   {
-    editingDomain.getResourceSet().getResources().get(0).setURI(uri);
+    (editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
     setInputWithNotify(editorInput);
     setPartName(editorInput.getName());
     IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null ? getActionBars()
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelModelWizard.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelModelWizard.java
index 5fc99a0bf2..ef8518bb1b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelModelWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelModelWizard.java
@@ -285,13 +285,13 @@ public class DawngenmodelModelWizard extends Wizard implements INewWizard
       //
       try
       {
-        page.openEditor(new FileEditorInput(modelFile), workbench.getEditorRegistry().getDefaultEditor(
-            modelFile.getFullPath().toString()).getId());
+        page.openEditor(new FileEditorInput(modelFile),
+            workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
       }
       catch (PartInitException exception)
       {
-        MessageDialog.openError(workbenchWindow.getShell(), DawnCodeGenEditorPlugin.INSTANCE
-            .getString("_UI_OpenEditorError_label"), exception.getMessage());
+        MessageDialog.openError(workbenchWindow.getShell(),
+            DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
         return false;
       }
 
@@ -571,8 +571,8 @@ public class DawngenmodelModelWizard extends Wizard implements INewWizard
       if (encodings == null)
       {
         encodings = new ArrayList<String>();
-        for (StringTokenizer stringTokenizer = new StringTokenizer(DawnCodeGenEditorPlugin.INSTANCE
-            .getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();)
+        for (StringTokenizer stringTokenizer = new StringTokenizer(
+            DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();)
         {
           encodings.add(stringTokenizer.nextToken());
         }
@@ -596,8 +596,7 @@ public class DawngenmodelModelWizard extends Wizard implements INewWizard
     newFileCreationPage.setDescription(DawnCodeGenEditorPlugin.INSTANCE
         .getString("_UI_DawngenmodelModelWizard_description"));
     newFileCreationPage.setFileName(DawnCodeGenEditorPlugin.INSTANCE
-        .getString("_UI_DawngenmodelEditorFilenameDefaultBase")
-        + "." + FILE_EXTENSIONS.get(0));
+        .getString("_UI_DawngenmodelEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
     addPage(newFileCreationPage);
 
     // Try and get the resource selection to determine a current directory for the file dialog.