[344403] [Dawn] Separated Dawn Codegen from specific implementations

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

9 files changed, 51 insertions, 343 deletions

diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/.classpath b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/.classpath
index 2734480ce0..9c0318f0fd 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/.classpath
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="src" path="src"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/META-INF/MANIFEST.MF
index be0cc0e9a2..2d03eef9a7 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/META-INF/MANIFEST.MF
@@ -24,5 +24,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.cdo.dawn.codegen;bundle-version="[1.0.0,2.0.0)",

  org.eclipse.jdt.core;bundle-version="[3.5.0,4.0.0)",

  org.eclipse.emf.mwe.core;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf;bundle-version="[1.0.0,2.0.0)"

+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf;bundle-version="[1.0.0,2.0.0)",

+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor;bundle-version="1.0.0"

 Bundle-ActivationPolicy: lazy

diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/icons/full/obj16/DawnGmfGenmodelModelFile.gif b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/icons/full/obj16/DawnGmfGenmodelModelFile.gif
deleted file mode 100644
index 4ef24bd30d..0000000000
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/icons/full/obj16/DawnGmfGenmodelModelFile.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/icons/full/obj16/dawn_16x16.gif b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/icons/full/obj16/dawn_16x16.gif
new file mode 100644
index 0000000000..af2ae6d3f5
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/icons/full/obj16/dawn_16x16.gif
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/icons/full/obj16/dawn_gemodel_gmf_16x16.gif b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/icons/full/obj16/dawn_gemodel_gmf_16x16.gif
new file mode 100644
index 0000000000..597c00be99
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/icons/full/obj16/dawn_gemodel_gmf_16x16.gif
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/plugin.xml b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/plugin.xml
index d4b0ccf266..330ab7b73b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/plugin.xml
@@ -15,15 +15,12 @@
 <plugin>

 

    <extension point="org.eclipse.ui.newWizards">

-      <category

-            id="org.eclipse.emf.ecore.Wizard.category.ID"

-            name="%_UI_Wizard_category"/>

       <wizard

             id="org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel.presentation.DawnGmfGenmodelModelWizardID"

             name="%_UI_DawnGmfGenmodelModelWizard_label"

             class="org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel.presentation.DawnGmfGenmodelModelWizard"

-            category="org.eclipse.emf.ecore.Wizard.category.ID"

-            icon="icons/full/obj16/DawnGmfGenmodelModelFile.gif">

+            category="org.eclipse.emf.cdo.dawn.ui.category.dawn"

+            icon="icons/full/obj16/dawn_gemodel_gmf_16x16.gif">

          <description>%_UI_DawnGmfGenmodelModelWizard_description</description>

          <selection class="org.eclipse.core.resources.IResource"/>

       </wizard>

@@ -33,8 +30,8 @@
       <editor

             id="org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel.presentation.DawnGmfGenmodelEditorID"

             name="%_UI_DawnGmfGenmodelEditor_label"

-            icon="icons/full/obj16/DawnGmfGenmodelModelFile.gif"

-            extensions="dawngenmodel.gmf"

+            icon="icons/full/obj16/dawn_gemodel_gmf_16x16.gif"

+            extensions="dawngenmodel_gmf"

             class="org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel.presentation.DawnGmfGenmodelEditor"

             contributorClass="org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel.presentation.DawnGmfGenmodelActionBarContributor">

       </editor>

@@ -45,7 +42,7 @@
       <objectContribution

             adaptable="false"

             id="org.eclipse.emf.cdo.dawn.codegen.generate"

-            nameFilter="*.dawngenmodel.gmf"

+            nameFilter="*.dawngenmodel_gmf"

             objectClass="org.eclipse.core.resources.IFile">

         <action

                class="org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui.actions.GenerateGMFFragmentAction"

@@ -65,6 +62,13 @@
          </action>

       </objectContribution>

    </extension>

+   <extension

+         point="org.eclipse.emf.cdo.dawn.genmodel.ui.editors">

+      <editor

+            editor="org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel.presentation.DawnGmfGenmodelEditor"

+            file_extension="_gmf">

+      </editor>

+   </extension>

    

 

 </plugin>

diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnCodeGenEditorPlugin.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnCodeGenEditorPlugin.java
index ab92918914..01da405351 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnCodeGenEditorPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnCodeGenEditorPlugin.java
@@ -23,8 +23,8 @@ import org.eclipse.gmf.codegen.gmfgen.presentation.EditorPlugin;
 /**

  * This is the central singleton for the DawnCodeGen editor plugin. <!-- begin-user-doc --> <!-- end-user-doc -->

  * 

- * @generated

  * @author Martin Fluegge

+ * @generated

  */

 public final class DawnCodeGenEditorPlugin extends EMFPlugin

 {

diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelEditor.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelEditor.java
index 837f9cb3e7..f00e0e748e 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelEditor.java
@@ -21,7 +21,6 @@ import org.eclipse.emf.common.command.CommandStackListener;
 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

 import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

 import org.eclipse.emf.common.ui.viewer.IViewerProvider;

 import org.eclipse.emf.common.util.BasicDiagnostic;

@@ -74,17 +73,13 @@ import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;

 import org.eclipse.jface.dialogs.MessageDialog;

 import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.viewers.ColumnWeightData;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.ISelectionChangedListener;

 import org.eclipse.jface.viewers.ISelectionProvider;

 import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

 import org.eclipse.jface.viewers.SelectionChangedEvent;

 import org.eclipse.jface.viewers.StructuredSelection;

 import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

 import org.eclipse.jface.viewers.TreeViewer;

 import org.eclipse.jface.viewers.Viewer;

 import org.eclipse.swt.SWT;

@@ -94,13 +89,9 @@ import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.events.ControlAdapter;

 import org.eclipse.swt.events.ControlEvent;

 import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

 import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

 import org.eclipse.ui.IActionBars;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IEditorPart;

@@ -135,8 +126,8 @@ import java.util.Map;
 /**

  * This is an example of a DawnGmfGenmodel model editor. <!-- begin-user-doc --> <!-- end-user-doc -->

  * 

- * @generated

  * @author Martin Fluegge

+ * @generated

  */

 public class DawnGmfGenmodelEditor extends MultiPageEditorPart implements IEditingDomainProvider, ISelectionProvider,

     IMenuListener, IViewerProvider, IGotoMarker

@@ -201,51 +192,6 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart implements IEditi
   protected TreeViewer selectionViewer;

 

   /**

-   * This inverts the roll of parent and child in the content provider and show parents as a tree. <!-- begin-user-doc

-   * --> <!-- end-user-doc -->

-   * 

-   * @generated

-   */

-  protected TreeViewer parentViewer;

-

-  /**

-   * This shows how a tree view works. <!-- begin-user-doc --> <!-- end-user-doc -->

-   * 

-   * @generated

-   */

-  protected TreeViewer treeViewer;

-

-  /**

-   * This shows how a list view works. A list viewer doesn't support icons. <!-- begin-user-doc --> <!-- end-user-doc

-   * -->

-   * 

-   * @generated

-   */

-  protected ListViewer listViewer;

-

-  /**

-   * This shows how a table view works. A table can be used as a list with icons. <!-- begin-user-doc --> <!--

-   * end-user-doc -->

-   * 

-   * @generated

-   */

-  protected TableViewer tableViewer;

-

-  /**

-   * This shows how a tree view with columns works. <!-- begin-user-doc --> <!-- end-user-doc -->

-   * 

-   * @generated

-   */

-  protected TreeViewer treeViewerWithColumns;

-

-  /**

-   * This keeps track of the active viewer pane, in the book. <!-- begin-user-doc --> <!-- end-user-doc -->

-   * 

-   * @generated

-   */

-  protected ViewerPane currentViewerPane;

-

-  /**

    * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content

    * outline viewer. <!-- begin-user-doc --> <!-- end-user-doc -->

    * 

@@ -627,7 +573,7 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart implements IEditi
     if (updateProblemIndication)

     {

       BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK,

-          "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.editor", 0, null,

+          "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui", 0, null,

           new Object[] { editingDomain.getResourceSet() });

       for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values())

       {

@@ -877,24 +823,6 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart implements IEditi
   }

 

   /**

-   * <!-- begin-user-doc --> <!-- end-user-doc -->

-   * 

-   * @generated

-   */

-  public void setCurrentViewerPane(ViewerPane viewerPane)

-  {

-    if (currentViewerPane != viewerPane)

-    {

-      if (currentViewerPane != null)

-      {

-        currentViewerPane.showFocus(false);

-      }

-      currentViewerPane = viewerPane;

-    }

-    setCurrentViewer(currentViewerPane.getViewer());

-  }

-

-  /**

    * This makes sure that one content viewer, either for the current page or the outline view, if it has focus, is the

    * current one. <!-- begin-user-doc --> <!-- end-user-doc -->

    * 

@@ -1020,14 +948,14 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart implements IEditi
     if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty())

     {

       BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR,

-          "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.editor", 0, getString("_UI_CreateModelError_message",

+          "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui", 0, getString("_UI_CreateModelError_message",

               resource.getURI()), new Object[] { exception == null ? (Object)resource : exception });

       basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

       return basicDiagnostic;

     }

     else if (exception != null)

     {

-      return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.editor", 0,

+      return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui", 0,

           getString("_UI_CreateModelError_message", resource.getURI()), new Object[] { exception });

     }

     else

@@ -1055,223 +983,20 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart implements IEditi
     {

       // Create a page for the selection tree view.

       //

-      {

-        ViewerPane viewerPane = new ViewerPane(getSite().getPage(), DawnGmfGenmodelEditor.this)

-        {

-          @Override

-          public Viewer createViewer(Composite composite)

-          {

-            Tree tree = new Tree(composite, SWT.MULTI);

-            TreeViewer newTreeViewer = new TreeViewer(tree);

-            return newTreeViewer;

-          }

-

-          @Override

-          public void requestActivation()

-          {

-            super.requestActivation();

-            setCurrentViewerPane(this);

-          }

-        };

-        viewerPane.createControl(getContainer());

-

-        selectionViewer = (TreeViewer)viewerPane.getViewer();

-        selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-

-        selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-        selectionViewer.setInput(editingDomain.getResourceSet());

-        selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)),

-            true);

-        viewerPane.setTitle(editingDomain.getResourceSet());

-

-        new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-        createContextMenuFor(selectionViewer);

-        int pageIndex = addPage(viewerPane.getControl());

-        setPageText(pageIndex, getString("_UI_SelectionPage_label"));

-      }

-

-      // Create a page for the parent tree view.

-      //

-      {

-        ViewerPane viewerPane = new ViewerPane(getSite().getPage(), DawnGmfGenmodelEditor.this)

-        {

-          @Override

-          public Viewer createViewer(Composite composite)

-          {

-            Tree tree = new Tree(composite, SWT.MULTI);

-            TreeViewer newTreeViewer = new TreeViewer(tree);

-            return newTreeViewer;

-          }

-

-          @Override

-          public void requestActivation()

-          {

-            super.requestActivation();

-            setCurrentViewerPane(this);

-          }

-        };

-        viewerPane.createControl(getContainer());

-

-        parentViewer = (TreeViewer)viewerPane.getViewer();

-        parentViewer.setAutoExpandLevel(30);

-        parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-        parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-        createContextMenuFor(parentViewer);

-        int pageIndex = addPage(viewerPane.getControl());

-        setPageText(pageIndex, getString("_UI_ParentPage_label"));

-      }

-

-      // This is the page for the list viewer

-      //

-      {

-        ViewerPane viewerPane = new ViewerPane(getSite().getPage(), DawnGmfGenmodelEditor.this)

-        {

-          @Override

-          public Viewer createViewer(Composite composite)

-          {

-            return new ListViewer(composite);

-          }

-

-          @Override

-          public void requestActivation()

-          {

-            super.requestActivation();

-            setCurrentViewerPane(this);

-          }

-        };

-        viewerPane.createControl(getContainer());

-        listViewer = (ListViewer)viewerPane.getViewer();

-        listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-        listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-        createContextMenuFor(listViewer);

-        int pageIndex = addPage(viewerPane.getControl());

-        setPageText(pageIndex, getString("_UI_ListPage_label"));

-      }

-

-      // This is the page for the tree viewer

-      //

-      {

-        ViewerPane viewerPane = new ViewerPane(getSite().getPage(), DawnGmfGenmodelEditor.this)

-        {

-          @Override

-          public Viewer createViewer(Composite composite)

-          {

-            return new TreeViewer(composite);

-          }

-

-          @Override

-          public void requestActivation()

-          {

-            super.requestActivation();

-            setCurrentViewerPane(this);

-          }

-        };

-        viewerPane.createControl(getContainer());

-        treeViewer = (TreeViewer)viewerPane.getViewer();

-        treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-        treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-        new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-        createContextMenuFor(treeViewer);

-        int pageIndex = addPage(viewerPane.getControl());

-        setPageText(pageIndex, getString("_UI_TreePage_label"));

-      }

-

-      // This is the page for the table viewer.

-      //

-      {

-        ViewerPane viewerPane = new ViewerPane(getSite().getPage(), DawnGmfGenmodelEditor.this)

-        {

-          @Override

-          public Viewer createViewer(Composite composite)

-          {

-            return new TableViewer(composite);

-          }

-

-          @Override

-          public void requestActivation()

-          {

-            super.requestActivation();

-            setCurrentViewerPane(this);

-          }

-        };

-        viewerPane.createControl(getContainer());

-        tableViewer = (TableViewer)viewerPane.getViewer();

-

-        Table table = tableViewer.getTable();

-        TableLayout layout = new TableLayout();

-        table.setLayout(layout);

-        table.setHeaderVisible(true);

-        table.setLinesVisible(true);

-

-        TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-        layout.addColumnData(new ColumnWeightData(3, 100, true));

-        objectColumn.setText(getString("_UI_ObjectColumn_label"));

-        objectColumn.setResizable(true);

-

-        TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-        layout.addColumnData(new ColumnWeightData(2, 100, true));

-        selfColumn.setText(getString("_UI_SelfColumn_label"));

-        selfColumn.setResizable(true);

-

-        tableViewer.setColumnProperties(new String[] { "a", "b" });

-        tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-        tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-        createContextMenuFor(tableViewer);

-        int pageIndex = addPage(viewerPane.getControl());

-        setPageText(pageIndex, getString("_UI_TablePage_label"));

-      }

-

-      // This is the page for the table tree viewer.

-      //

-      {

-        ViewerPane viewerPane = new ViewerPane(getSite().getPage(), DawnGmfGenmodelEditor.this)

-        {

-          @Override

-          public Viewer createViewer(Composite composite)

-          {

-            return new TreeViewer(composite);

-          }

-

-          @Override

-          public void requestActivation()

-          {

-            super.requestActivation();

-            setCurrentViewerPane(this);

-          }

-        };

-        viewerPane.createControl(getContainer());

+      Tree tree = new Tree(getContainer(), SWT.MULTI);

+      selectionViewer = new TreeViewer(tree);

+      setCurrentViewer(selectionViewer);

 

-        treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

+      selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+      selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+      selectionViewer.setInput(editingDomain.getResourceSet());

+      selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

 

-        Tree tree = treeViewerWithColumns.getTree();

-        tree.setLayoutData(new FillLayout());

-        tree.setHeaderVisible(true);

-        tree.setLinesVisible(true);

+      new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

 

-        TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-        objectColumn.setText(getString("_UI_ObjectColumn_label"));

-        objectColumn.setResizable(true);

-        objectColumn.setWidth(250);

-

-        TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-        selfColumn.setText(getString("_UI_SelfColumn_label"));

-        selfColumn.setResizable(true);

-        selfColumn.setWidth(200);

-

-        treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" });

-        treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-        treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-        createContextMenuFor(treeViewerWithColumns);

-        int pageIndex = addPage(viewerPane.getControl());

-        setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label"));

-      }

+      createContextMenuFor(selectionViewer);

+      int pageIndex = addPage(tree);

+      setPageText(pageIndex, getString("_UI_SelectionPage_label"));

 

       getSite().getShell().getDisplay().asyncExec(new Runnable()

       {

@@ -1488,7 +1213,7 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart implements IEditi
         public void setActionBars(IActionBars actionBars)

         {

           super.setActionBars(actionBars);

-          getActionBarContributor().shareGlobalActions(this, actionBars);

+          // getActionBarContributor().shareGlobalActions(this, actionBars);

         }

       };

       propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

@@ -1505,7 +1230,7 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart implements IEditi
    */

   public void handleContentOutlineSelection(ISelection selection)

   {

-    if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection)

+    if (selectionViewer != null && !selection.isEmpty() && selection instanceof IStructuredSelection)

     {

       Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

       if (selectedElements.hasNext())

@@ -1514,31 +1239,16 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart implements IEditi
         //

         Object selectedElement = selectedElements.next();

 

-        // If it's the selection viewer, then we want it to select the same selection as this selection.

-        //

-        if (currentViewerPane.getViewer() == selectionViewer)

-        {

-          ArrayList<Object> selectionList = new ArrayList<Object>();

-          selectionList.add(selectedElement);

-          while (selectedElements.hasNext())

-          {

-            selectionList.add(selectedElements.next());

-          }

-

-          // Set the selection to the widget.

-          //

-          selectionViewer.setSelection(new StructuredSelection(selectionList));

-        }

-        else

+        ArrayList<Object> selectionList = new ArrayList<Object>();

+        selectionList.add(selectedElement);

+        while (selectedElements.hasNext())

         {

-          // Set the input to the widget.

-          //

-          if (currentViewerPane.getViewer().getInput() != selectedElement)

-          {

-            currentViewerPane.getViewer().setInput(selectedElement);

-            currentViewerPane.setTitle(selectedElement);

-          }

+          selectionList.add(selectedElements.next());

         }

+

+        // Set the selection to the widget.

+        //

+        selectionViewer.setSelection(new StructuredSelection(selectionList));

       }

     }

   }

@@ -1753,14 +1463,7 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart implements IEditi
   @Override

   public void setFocus()

   {

-    if (currentViewerPane != null)

-    {

-      currentViewerPane.setFocus();

-    }

-    else

-    {

-      getControl(getActivePage()).setFocus();

-    }

+    getControl(getActivePage()).setFocus();

   }

 

   /**

@@ -1798,7 +1501,7 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart implements IEditi
    * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

    * Calling this result will notify the listeners. <!-- begin-user-doc --> <!-- end-user-doc -->

    * 

-   * @generated

+   * @generated NOT

    */

   public void setSelection(ISelection selection)

   {

@@ -1808,7 +1511,7 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart implements IEditi
     {

       listener.selectionChanged(new SelectionChangedEvent(this, selection));

     }

-    setStatusLineManager(selection);

+    // setStatusLineManager(selection);

   }

 

   /**

@@ -1917,7 +1620,7 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart implements IEditi
   /**

    * <!-- begin-user-doc --> <!-- end-user-doc -->

    * 

-   * @generated

+   * @generated NOT

    */

   @Override

   public void dispose()

@@ -1930,10 +1633,10 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart implements IEditi
 

     adapterFactory.dispose();

 

-    if (getActionBarContributor().getActiveEditor() == this)

-    {

-      getActionBarContributor().setActiveEditor(null);

-    }

+    // if (getActionBarContributor().getActiveEditor() == this)

+    // {

+    // getActionBarContributor().setActiveEditor(null);

+    // }

 

     if (propertySheetPage != null)

     {

@@ -1955,6 +1658,6 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart implements IEditi
    */

   protected boolean showOutlineView()

   {

-    return true;

+    return false;

   }

 }

diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/ui/actions/GenerateDawnGenModelGMFAction.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/ui/actions/GenerateDawnGenModelGMFAction.java
index 757b04b820..7411d0312f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/ui/actions/GenerateDawnGenModelGMFAction.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/ui/actions/GenerateDawnGenModelGMFAction.java
@@ -88,6 +88,6 @@ public class GenerateDawnGenModelGMFAction extends GenerateDawnGenModelAction
   @Override

   protected Resource getDawnFragmentModelResource(String path, String modelname, ResourceSet resourceSet)

   {

-    return getResource(path, modelname, resourceSet, dawngenmodelFileExtension + "." + gmfGenmodelFileExtension);

+    return getResource(path, modelname, resourceSet, dawngenmodelFileExtension + "_" + gmfGenmodelFileExtension);

   }

 }