Merge pull request #1431 from eclipse/cd_xtext_core_issue1318

[eclipse/xtext-core#1318] fixed dependencies of file template active annotation in wizard
This commit is contained in:
Christian Dietrich 2020-03-27 08:22:12 +01:00 committed by GitHub
commit 8fca1c6546
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View file

@ -58,7 +58,8 @@ class TemplateFileWizardFragment extends AbstractXtextGeneratorFragment {
"org.eclipse.core.resources",
"org.eclipse.ui",
"org.eclipse.ui.ide",
"org.eclipse.ui.forms"
"org.eclipse.ui.forms",
"org.eclipse.xtend.lib"
]
projectConfig.eclipsePlugin.manifest.exportedPackages += #[
grammar.getEclipsePluginBasePackage + ".wizard"

View file

@ -80,7 +80,7 @@ public class TemplateFileWizardFragment extends AbstractXtextGeneratorFragment {
boolean _tripleNotEquals = (_manifest != null);
if (_tripleNotEquals) {
Set<String> _requiredBundles = this.getProjectConfig().getEclipsePlugin().getManifest().getRequiredBundles();
Iterables.<String>addAll(_requiredBundles, Collections.<String>unmodifiableList(CollectionLiterals.<String>newArrayList("org.eclipse.core.runtime", "org.eclipse.core.resources", "org.eclipse.ui", "org.eclipse.ui.ide", "org.eclipse.ui.forms")));
Iterables.<String>addAll(_requiredBundles, Collections.<String>unmodifiableList(CollectionLiterals.<String>newArrayList("org.eclipse.core.runtime", "org.eclipse.core.resources", "org.eclipse.ui", "org.eclipse.ui.ide", "org.eclipse.ui.forms", "org.eclipse.xtend.lib")));
Set<String> _exportedPackages = this.getProjectConfig().getEclipsePlugin().getManifest().getExportedPackages();
String _eclipsePluginBasePackage = this._xtextGeneratorNaming.getEclipsePluginBasePackage(this.getGrammar());
String _plus = (_eclipsePluginBasePackage + ".wizard");