diff options
4 files changed, 9 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/template/GMFFragmentTemplate.xpt b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/template/GMFFragmentTemplate.xpt index 490297e189..b22507a0b3 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/template/GMFFragmentTemplate.xpt +++ b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/template/GMFFragmentTemplate.xpt @@ -98,7 +98,6 @@ public class «this.dawnEditorClassName» extends «GMFGenEditorGenerator.editor.cl } dawnEditorSupport.setView(((DawnEditorInput)input).getView()); - dawnEditorSupport.registerListeners(); } «EXPAND generatedComment -» @@ -106,6 +105,7 @@ public class «this.dawnEditorClassName» extends «GMFGenEditorGenerator.editor.cl protected void initializeGraphicalViewer() { super.initializeGraphicalViewer(); + dawnEditorSupport.registerListeners(); } «EXPAND generatedComment -» diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDiagramEditor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDiagramEditor.java index 616eb575d3..bfebc22501 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDiagramEditor.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDiagramEditor.java @@ -68,13 +68,13 @@ public class DawnAcoreDiagramEditor extends AcoreDiagramEditor implements IDawnE } dawnEditorSupport.setView(((DawnEditorInput)input).getView()); - dawnEditorSupport.registerListeners(); } @Override protected void initializeGraphicalViewer() { super.initializeGraphicalViewer(); + dawnEditorSupport.registerListeners(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnUITest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnUITest.java index dee6c53678..721b1b48a6 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnUITest.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnUITest.java @@ -46,7 +46,9 @@ public abstract class AbstractDawnUITest<T extends SWTWorkbenchBot> extends Abst SWTBotPreferences.SCREENSHOTS_DIR = DawnTestPlatform.instance.getTestFolder(); resetWorkbench(); DawnSWTBotUtil.initTest(getBot()); - // getBot().viewByTitle("CDO Sessions").close(); + + // TODO Remove this line if bug 323788 is solved. + getBot().viewByTitle("CDO Sessions").close(); } /** diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java index f4220407ac..b2e2ad151c 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java @@ -17,8 +17,10 @@ import org.eclipse.emf.cdo.dawn.tests.ui.DawnProjectExplorerTest; import org.eclipse.emf.cdo.dawn.tests.ui.emf.DawnEMFCreationWizardTest; import org.eclipse.emf.cdo.dawn.tests.ui.emf.DawnEMFHandleEditorTest; import org.eclipse.emf.cdo.dawn.tests.ui.emf.EMFEditorRollbackTest; +import org.eclipse.emf.cdo.dawn.tests.ui.gmf.ConflictTest; import org.eclipse.emf.cdo.dawn.tests.ui.gmf.DawnCreationWizardSWTBotTest; import org.eclipse.emf.cdo.dawn.tests.ui.gmf.MultipleResourcesTest; +import org.eclipse.emf.cdo.dawn.tests.ui.gmf.RollbackTest; import org.eclipse.emf.cdo.dawn.tests.ui.gmf.SimpleDiagramTest; import org.eclipse.emf.cdo.tests.AllTests; import org.eclipse.emf.cdo.tests.config.impl.ConfigTest; @@ -55,10 +57,9 @@ public class AllTestsDawnUISWTBot extends ConfigTestSuite testClasses.add(DawnCreationWizardSWTBotTest.class); testClasses.add(SimpleDiagramTest.class); testClasses.add(MultipleResourcesTest.class); - // MultipleResourcesDeletionTest.class, //excluded because of ui freeze testClasses.add(DawnProjectExplorerTest.class); - // testClasses.add(RollbackTest.class); - // testClasses.add(ConflictTest.class); + testClasses.add(RollbackTest.class); + testClasses.add(ConflictTest.class); /******************** EMF **********************/ testClasses.add(DawnEMFCreationWizardTest.class); |