mirror of
https://github.com/sigmasternchen/xtext-core
synced 2025-03-16 00:38:56 +00:00
adjust fragments to changes in projectConfig API
This commit is contained in:
parent
b7004aced8
commit
9a195a4ca8
4 changed files with 54 additions and 54 deletions
|
@ -1,28 +1,28 @@
|
|||
Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.xtext.ide;singleton:=true
|
||||
Bundle-Version: 2.9.0.qualifier
|
||||
Bundle-Localization: plugin
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-Vendor: %providerName
|
||||
Require-Bundle: org.eclipse.xtext;visibility:=reexport,
|
||||
org.eclipse.xtend.lib
|
||||
Import-Package: org.apache.log4j;version="1.2.15"
|
||||
Export-Package: org.eclipse.xtext.ide;x-friends:="org.eclipse.xtend.ide",
|
||||
org.eclipse.xtext.ide.editor.bracketmatching;x-friends:="org.eclipse.xtend.ide.common,org.eclipse.xtend.ide",
|
||||
org.eclipse.xtext.ide.editor.contentassist;x-friends:="org.eclipse.xtend.ide,org.eclipse.xtext.xbase.ide",
|
||||
org.eclipse.xtext.ide.editor.contentassist.antlr;x-friends:="org.eclipse.xtend.ide.common,org.eclipse.xtend.ide",
|
||||
org.eclipse.xtext.ide.editor.contentassist.antlr.internal;x-friends:="org.eclipse.xtend.ide.common,org.eclipse.xtend.ide",
|
||||
org.eclipse.xtext.ide.editor.model;x-internal:=true,
|
||||
org.eclipse.xtext.ide.editor.partialEditing;x-friends:="org.eclipse.xtend.ide",
|
||||
org.eclipse.xtext.ide.editor.syntaxcoloring;
|
||||
x-friends:="org.eclipse.xtext.xbase.ide,
|
||||
org.eclipse.xtext.ui,
|
||||
org.eclipse.xtext.xbase.ui,
|
||||
org.eclipse.xtend.ide,
|
||||
org.eclipse.xtext.xtext.ui,
|
||||
org.eclipse.xtext.xtext.ui.tests,
|
||||
org.eclipse.xtend.ide.common",
|
||||
org.eclipse.xtext.ide.labels;x-friends:="org.eclipse.xtext.web"
|
||||
Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.xtext.ide;singleton:=true
|
||||
Bundle-Version: 2.9.0.qualifier
|
||||
Bundle-Localization: plugin
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-Vendor: %providerName
|
||||
Require-Bundle: org.eclipse.xtext;visibility:=reexport,
|
||||
org.eclipse.xtend.lib
|
||||
Import-Package: org.apache.log4j;version="1.2.15"
|
||||
Export-Package: org.eclipse.xtext.ide;x-friends:="org.eclipse.xtend.ide",
|
||||
org.eclipse.xtext.ide.editor.bracketmatching;x-friends:="org.eclipse.xtend.ide.common,org.eclipse.xtend.ide",
|
||||
org.eclipse.xtext.ide.editor.contentassist;x-friends:="org.eclipse.xtend.ide,org.eclipse.xtext.xbase.ide",
|
||||
org.eclipse.xtext.ide.editor.contentassist.antlr,
|
||||
org.eclipse.xtext.ide.editor.contentassist.antlr.internal,
|
||||
org.eclipse.xtext.ide.editor.model;x-internal:=true,
|
||||
org.eclipse.xtext.ide.editor.partialEditing;x-friends:="org.eclipse.xtend.ide",
|
||||
org.eclipse.xtext.ide.editor.syntaxcoloring;
|
||||
x-friends:="org.eclipse.xtext.xbase.ide,
|
||||
org.eclipse.xtext.ui,
|
||||
org.eclipse.xtext.xbase.ui,
|
||||
org.eclipse.xtend.ide,
|
||||
org.eclipse.xtext.xtext.ui,
|
||||
org.eclipse.xtext.xtext.ui.tests,
|
||||
org.eclipse.xtend.ide.common",
|
||||
org.eclipse.xtext.ide.labels;x-friends:="org.eclipse.xtext.web"
|
||||
|
|
|
@ -83,8 +83,8 @@ class ContentAssistFragment2 extends AbstractGeneratorFragment2 {
|
|||
val chosenClass =
|
||||
if (generateStub) grammar.getProposalProviderClass else grammar.getGenProposalProviderClass;
|
||||
|
||||
if (projectConfig.eclipsePluginManifest != null) {
|
||||
projectConfig.eclipsePluginManifest.requiredBundles += "org.eclipse.xtext.ui"
|
||||
if (projectConfig.eclipsePlugin.manifest != null) {
|
||||
projectConfig.eclipsePlugin.manifest.requiredBundles += "org.eclipse.xtext.ui"
|
||||
}
|
||||
|
||||
new GuiceModuleAccess.BindingFactory()
|
||||
|
@ -93,26 +93,26 @@ class ContentAssistFragment2 extends AbstractGeneratorFragment2 {
|
|||
chosenClass
|
||||
).contributeTo(language.eclipsePluginGenModule);
|
||||
|
||||
if (projectConfig.eclipsePluginSrcGen !== null) {
|
||||
if (projectConfig.eclipsePlugin.srcGen !== null) {
|
||||
// generate the 'Abstract...ProposalProvider'
|
||||
generateGenJavaProposalProvider
|
||||
}
|
||||
|
||||
if (generateStub && projectConfig.eclipsePluginSrc != null) {
|
||||
if (generateStub && projectConfig.eclipsePlugin.src != null) {
|
||||
if (preferXtendStubs) {
|
||||
generateXtendProposalProviderStub
|
||||
|
||||
if (projectConfig.eclipsePluginManifest != null) {
|
||||
projectConfig.eclipsePluginManifest.requiredBundles += "org.eclipse.xtext.xbase.lib"
|
||||
projectConfig.eclipsePluginManifest.requiredBundles += "org.eclipse.xtend.lib;resolution:=optional"
|
||||
if (projectConfig.eclipsePlugin.manifest != null) {
|
||||
projectConfig.eclipsePlugin.manifest.requiredBundles += "org.eclipse.xtext.xbase.lib"
|
||||
projectConfig.eclipsePlugin.manifest.requiredBundles += "org.eclipse.xtend.lib;resolution:=optional"
|
||||
}
|
||||
} else {
|
||||
generateJavaProposalProviderStub
|
||||
}
|
||||
}
|
||||
|
||||
if (projectConfig.eclipsePluginManifest != null) {
|
||||
projectConfig.eclipsePluginManifest.exportedPackages += grammar.proposalProviderClass.packageName
|
||||
if (projectConfig.eclipsePlugin.manifest != null) {
|
||||
projectConfig.eclipsePlugin.manifest.exportedPackages += grammar.proposalProviderClass.packageName
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -126,7 +126,7 @@ class ContentAssistFragment2 extends AbstractGeneratorFragment2 {
|
|||
*/
|
||||
class «grammar.proposalProviderClass.simpleName» extends «grammar.genProposalProviderClass» {
|
||||
}
|
||||
''').writeTo(projectConfig.eclipsePluginSrc)
|
||||
''').writeTo(projectConfig.eclipsePlugin.src)
|
||||
}
|
||||
|
||||
def generateJavaProposalProviderStub() {
|
||||
|
@ -137,7 +137,7 @@ class ContentAssistFragment2 extends AbstractGeneratorFragment2 {
|
|||
*/
|
||||
public class «grammar.proposalProviderClass.simpleName» extends «grammar.genProposalProviderClass» {
|
||||
}
|
||||
''').writeTo(projectConfig.eclipsePluginSrc)
|
||||
''').writeTo(projectConfig.eclipsePlugin.src)
|
||||
}
|
||||
|
||||
|
||||
|
@ -191,7 +191,7 @@ class ContentAssistFragment2 extends AbstractGeneratorFragment2 {
|
|||
}
|
||||
«ENDFOR»
|
||||
}
|
||||
''').writeTo(projectConfig.eclipsePluginSrcGen)
|
||||
''').writeTo(projectConfig.eclipsePlugin.srcGen)
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -91,8 +91,8 @@ class LabelProviderFragment2 extends AbstractGeneratorFragment2 {
|
|||
override generate() {
|
||||
if (generateStub || grammar.inheritsXbase) {
|
||||
|
||||
if (projectConfig.eclipsePluginManifest != null) {
|
||||
projectConfig.eclipsePluginManifest.requiredBundles += "org.eclipse.xtext.ui"
|
||||
if (projectConfig.eclipsePlugin.manifest != null) {
|
||||
projectConfig.eclipsePlugin.manifest.requiredBundles += "org.eclipse.xtext.ui"
|
||||
}
|
||||
|
||||
val labelProviderClass =
|
||||
|
@ -115,7 +115,7 @@ class LabelProviderFragment2 extends AbstractGeneratorFragment2 {
|
|||
''').contributeTo(language.eclipsePluginGenModule)
|
||||
}
|
||||
|
||||
if (generateStub && projectConfig.eclipsePluginSrc !== null) {
|
||||
if (generateStub && projectConfig.eclipsePlugin.src !== null) {
|
||||
if (preferXtendStubs) {
|
||||
generateXtendEObjectLabelProvider
|
||||
generateXtendDescriptionLabelProvider
|
||||
|
@ -150,7 +150,7 @@ class LabelProviderFragment2 extends AbstractGeneratorFragment2 {
|
|||
// 'Greeting.gif'
|
||||
// }
|
||||
}
|
||||
''').writeTo(projectConfig.eclipsePluginSrc)
|
||||
''').writeTo(projectConfig.eclipsePlugin.src)
|
||||
}
|
||||
|
||||
def protected generateXtendDescriptionLabelProvider() {
|
||||
|
@ -172,7 +172,7 @@ class LabelProviderFragment2 extends AbstractGeneratorFragment2 {
|
|||
// ele.EClass.name + '.gif'
|
||||
// }
|
||||
}
|
||||
''').writeTo(projectConfig.eclipsePluginSrc)
|
||||
''').writeTo(projectConfig.eclipsePlugin.src)
|
||||
}
|
||||
|
||||
def protected generateJavaEObjectLabelProvider() {
|
||||
|
@ -201,7 +201,7 @@ class LabelProviderFragment2 extends AbstractGeneratorFragment2 {
|
|||
// return "Greeting.gif";
|
||||
// }
|
||||
}
|
||||
''').writeTo(projectConfig.eclipsePluginSrc)
|
||||
''').writeTo(projectConfig.eclipsePlugin.src)
|
||||
}
|
||||
|
||||
def protected generateJavaDescriptionLabelProvider() {
|
||||
|
@ -223,6 +223,6 @@ class LabelProviderFragment2 extends AbstractGeneratorFragment2 {
|
|||
// return ele.getEClass().getName() + ".gif";
|
||||
// }
|
||||
}
|
||||
''').writeTo(projectConfig.eclipsePluginSrc)
|
||||
''').writeTo(projectConfig.eclipsePlugin.src)
|
||||
}
|
||||
}
|
|
@ -76,18 +76,18 @@ class QuickfixProviderFragment2 extends AbstractGeneratorFragment2 {
|
|||
instanceClass
|
||||
).contributeTo(language.eclipsePluginGenModule);
|
||||
|
||||
if (generateStub && projectConfig.eclipsePluginSrc !== null) {
|
||||
if (generateStub && projectConfig.eclipsePlugin.src !== null) {
|
||||
if (preferXtendStubs) {
|
||||
generateXtendQuickfixProvider
|
||||
} else {
|
||||
generateJavaQuickfixProvider
|
||||
}
|
||||
|
||||
if (projectConfig.eclipsePluginManifest != null) {
|
||||
projectConfig.eclipsePluginManifest.exportedPackages += grammar.quickfixProviderClass.packageName
|
||||
if (projectConfig.eclipsePlugin.manifest != null) {
|
||||
projectConfig.eclipsePlugin.manifest.exportedPackages += grammar.quickfixProviderClass.packageName
|
||||
}
|
||||
|
||||
if (projectConfig.eclipsePluginPluginXml != null) {
|
||||
if (projectConfig.eclipsePlugin.pluginXml != null) {
|
||||
addRegistrationToPluginXml
|
||||
}
|
||||
}
|
||||
|
@ -112,7 +112,7 @@ class QuickfixProviderFragment2 extends AbstractGeneratorFragment2 {
|
|||
// ]
|
||||
// }
|
||||
}
|
||||
''').writeTo(projectConfig.eclipsePluginSrc)
|
||||
''').writeTo(projectConfig.eclipsePlugin.src)
|
||||
}
|
||||
|
||||
protected def generateJavaQuickfixProvider() {
|
||||
|
@ -136,14 +136,14 @@ class QuickfixProviderFragment2 extends AbstractGeneratorFragment2 {
|
|||
// }
|
||||
|
||||
}
|
||||
''').writeTo(projectConfig.eclipsePluginSrc)
|
||||
''').writeTo(projectConfig.eclipsePlugin.src)
|
||||
}
|
||||
|
||||
protected def addRegistrationToPluginXml() {
|
||||
val markerTypePrefix = grammar.eclipsePluginBasePackage + "." + grammar.simpleName.toLowerCase
|
||||
val executableExtensionFactory = grammar.eclipsePluginExecutableExtensionFactory
|
||||
|
||||
projectConfig.eclipsePluginPluginXml.entries += '''
|
||||
projectConfig.eclipsePlugin.pluginXml.entries += '''
|
||||
<!-- quickfix marker resolution generator for «grammar.name» -->
|
||||
<extension
|
||||
point="org.eclipse.ui.ide.markerResolution">
|
||||
|
|
Loading…
Reference in a new issue