sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-16 08:48:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[xtext generator] improved 'LabelProviderFragment2' as suggested in review

Browse source 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
This commit is contained in:
Christian Schneider 2015-10-08 14:54:56 +02:00
parent ce66736691
commit ec73ec8ae4
1 changed files with 25 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/labeling/LabelProviderFragment2.xtend
View file

@ -89,40 +89,33 @@ class LabelProviderFragment2 extends AbstractGeneratorFragment2 {
override generate() {
if (!generateStub && !grammar.inheritsXbase) {
// the binding of the DefaultEObjectLabelProvider and the
// DefaultDescriptionLabelProvider is done in the DefaultUIModule, so ...
return;
if (generateStub || grammar.inheritsXbase) {
if (projectConfig.eclipsePluginManifest != null) {
projectConfig.eclipsePluginManifest.requiredBundles += "org.eclipse.xtext.ui"
}
val labelProviderClass =
if (generateStub) grammar.EObjectLabelProviderClass
else new TypeReference(XBASE_LABEL_PROVIDER)
val descriptionLabelProviderClass =
if (generateStub) grammar.descriptionLabelProviderClass
else new TypeReference(XBASE_DESCRIPTION_LABEL_PROVIDER)
val iLabelProviderClass = new TypeReference("org.eclipse.jface.viewers.ILabelProvider")
val rsdLabelProviderClass =
new TypeReference("org.eclipse.xtext.ui.resource.ResourceServiceDescriptionLabelProvider")
new GuiceModuleAccess.BindingFactory()
.addTypeToType(iLabelProviderClass, labelProviderClass)
.addConfiguredBinding("ResourceUIServiceLabelProvider", '''
binder.bind(«iLabelProviderClass».class).annotatedWith(«
rsdLabelProviderClass».class).to(«descriptionLabelProviderClass».class);
''').contributeTo(language.eclipsePluginGenModule)
}
if (projectConfig.eclipsePluginManifest != null) {
projectConfig.eclipsePluginManifest.requiredBundles += "org.eclipse.xtext.ui"
}
val labelProviderClass =
if (generateStub) grammar.EObjectLabelProviderClass
else new TypeReference(XBASE_LABEL_PROVIDER)
val descriptionLabelProviderClass =
if (generateStub) grammar.descriptionLabelProviderClass
else new TypeReference(XBASE_DESCRIPTION_LABEL_PROVIDER)
val iLabelProviderClass = new TypeReference("org.eclipse.jface.viewers.ILabelProvider")
val rsdLabelProviderClass =
new TypeReference("org.eclipse.xtext.ui.resource.ResourceServiceDescriptionLabelProvider")
new GuiceModuleAccess.BindingFactory()
.addTypeToType(iLabelProviderClass, labelProviderClass)
.addConfiguredBinding("ResourceUIServiceLabelProvider", '''
binder.bind(«iLabelProviderClass».class).annotatedWith(«
rsdLabelProviderClass».class).to(«descriptionLabelProviderClass».class);
''').contributeTo(language.eclipsePluginGenModule)
if (!generateStub) {
return;
}
if (projectConfig.eclipsePluginSrc !== null) {
if (generateStub && projectConfig.eclipsePluginSrc !== null) {
if (preferXtendStubs) {
generateXtendEObjectLabelProvider
generateXtendDescriptionLabelProvider