diff --git a/plugins/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF
index 76fb8f231..6f427cb81 100644
--- a/plugins/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF
@@ -43,6 +43,7 @@ Export-Package: org.eclipse.xtext.xtext.generator,
org.eclipse.xtext.xtext.generator.parser.antlr.splitting.simpleExpressions.util;x-internal:=true,
org.eclipse.xtext.xtext.generator.scoping,
org.eclipse.xtext.xtext.generator.types,
+ org.eclipse.xtext.xtext.generator.ui.compare,
org.eclipse.xtext.xtext.generator.ui.contentAssist,
org.eclipse.xtext.xtext.generator.ui.labeling,
org.eclipse.xtext.xtext.generator.ui.outline,
diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/compare/CompareFragment2.xtend b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/compare/CompareFragment2.xtend
new file mode 100644
index 000000000..f76e3d571
--- /dev/null
+++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/compare/CompareFragment2.xtend
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2015 itemis AG (http://www.itemis.eu) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+package org.eclipse.xtext.xtext.generator.ui.compare
+
+import com.google.inject.Inject
+import org.apache.log4j.Logger
+import org.eclipse.xtext.xtext.generator.AbstractGeneratorFragment2
+import org.eclipse.xtext.xtext.generator.XtextGeneratorNaming
+import org.eclipse.xtext.xtext.generator.model.GuiceModuleAccess
+import org.eclipse.xtext.xtext.generator.model.TypeReference
+
+import static extension org.eclipse.xtext.GrammarUtil.*
+
+/**
+ * Contributes the registration of compare infrastructure.
+ *
+ * @author Christian Schneider - Initial contribution and API
+ */
+class CompareFragment2 extends AbstractGeneratorFragment2 {
+
+ private static final Logger log = Logger.getLogger(CompareFragment2);
+
+ @Inject
+ extension XtextGeneratorNaming
+
+ override generate() {
+ if (log.isInfoEnabled()) {
+ log.info("generating Compare Framework infrastructure");
+ }
+
+ if (projectConfig.eclipsePluginManifest != null) {
+ projectConfig.eclipsePluginManifest.requiredBundles += "org.eclipse.xtext.ui"
+ }
+
+ new GuiceModuleAccess.BindingFactory()
+ .addTypeToType(
+ new TypeReference("org.eclipse.compare.IViewerCreator"),
+ new TypeReference("org.eclipse.xtext.ui.compare.DefaultViewerCreator")
+ ).contributeTo(language.eclipsePluginGenModule);
+
+ if (projectConfig.eclipsePluginPluginXml != null) {
+ projectConfig.eclipsePluginPluginXml.entries += '''
+
+
+
+
+
+
+
+
+
+
+
+
+
+ «FOR modelFileExtension : language.fileExtensions»
+
+
+ «ENDFOR»
+
+ '''
+ }
+ }
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend b/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
index 6b1b42a44..69c0aaf19 100644
--- a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
+++ b/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
@@ -312,9 +312,8 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
}
// provides a compare view
- fragment = adapter.FragmentAdapter {
- fragment = compare.CompareFragment auto-inject {}
- }
+ fragment = ui.compare.CompareFragment2 auto-inject {}
+
«ENDIF»
«IF config.uiProject.enabled || config.ideProject.enabled»
// generates a more lightweight Antlr parser and lexer tailored for content assist
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
index bd6be0ffa..c13a5a5ca 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
@@ -112,9 +112,8 @@ Workflow {
}
// provides a compare view
- fragment = adapter.FragmentAdapter {
- fragment = compare.CompareFragment auto-inject {}
- }
+ fragment = ui.compare.CompareFragment2 auto-inject {}
+
// generates a more lightweight Antlr parser and lexer tailored for content assist
fragment = adapter.FragmentAdapter {
fragment = parser.antlr.XtextAntlrUiGeneratorFragment auto-inject {}
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
index eb978681e..9b4ba9419 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
@@ -118,9 +118,8 @@ Workflow {
}
// provides a compare view
- fragment = adapter.FragmentAdapter {
- fragment = compare.CompareFragment auto-inject {}
- }
+ fragment = ui.compare.CompareFragment2 auto-inject {}
+
// generates a more lightweight Antlr parser and lexer tailored for content assist
fragment = adapter.FragmentAdapter {
fragment = parser.antlr.XtextAntlrUiGeneratorFragment auto-inject {}
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
index c5ddb4385..f99d158f9 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2
@@ -115,9 +115,8 @@ Workflow {
}
// provides a compare view
- fragment = adapter.FragmentAdapter {
- fragment = compare.CompareFragment auto-inject {}
- }
+ fragment = ui.compare.CompareFragment2 auto-inject {}
+
// generates a more lightweight Antlr parser and lexer tailored for content assist
fragment = adapter.FragmentAdapter {
fragment = parser.antlr.XtextAntlrUiGeneratorFragment auto-inject {}