Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.etrice.core.common.ui/src/org/eclipse/etrice/core/common/ui/labeling/BaseLabelProvider.xtend39
1 files changed, 21 insertions, 18 deletions
diff --git a/plugins/org.eclipse.etrice.core.common.ui/src/org/eclipse/etrice/core/common/ui/labeling/BaseLabelProvider.xtend b/plugins/org.eclipse.etrice.core.common.ui/src/org/eclipse/etrice/core/common/ui/labeling/BaseLabelProvider.xtend
index 030e1fc72..d9e486e8b 100644
--- a/plugins/org.eclipse.etrice.core.common.ui/src/org/eclipse/etrice/core/common/ui/labeling/BaseLabelProvider.xtend
+++ b/plugins/org.eclipse.etrice.core.common.ui/src/org/eclipse/etrice/core/common/ui/labeling/BaseLabelProvider.xtend
@@ -14,20 +14,21 @@
package org.eclipse.etrice.core.common.ui.labeling
import com.google.inject.Inject
-import org.eclipse.jface.viewers.StyledString
-import org.eclipse.jface.viewers.StyledString.Styler;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider
import org.eclipse.etrice.core.common.base.Import
-import org.eclipse.xtext.ui.label.StylerFactory
import org.eclipse.jface.resource.JFaceResources
-import org.eclipse.swt.SWT
+import org.eclipse.jface.viewers.StyledString
+import org.eclipse.jface.viewers.StyledString.Styler
import org.eclipse.swt.graphics.RGB
+import org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider
+import org.eclipse.xtext.ui.label.StylerFactory
/**
* Provides labels for a EObjects.
*
* see http://www.eclipse.org/Xtext/documentation.html#labelProvider
*/
-class BaseLabelProvider extends org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider {
+class BaseLabelProvider extends DefaultEObjectLabelProvider {
protected static final String KEYWORD_COLOR = "KEYWORD_COLOR";
@@ -38,7 +39,7 @@ class BaseLabelProvider extends org.eclipse.xtext.ui.label.DefaultEObjectLabelPr
protected Styler typeStyler = null;
@Inject
- new(org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider delegate) {
+ new(AdapterFactoryLabelProvider delegate) {
super(delegate);
JFaceResources.getColorRegistry().put(KEYWORD_COLOR, new RGB(50, 50, 50));
@@ -61,20 +62,22 @@ class BaseLabelProvider extends org.eclipse.xtext.ui.label.DefaultEObjectLabelPr
}
def protected Styler getKeywordStyler() {
- if (keywordStyler===null) {
- var font = JFaceResources.getFontDescriptor(JFaceResources.TEXT_FONT)
- var boldFont = font.setStyle(SWT.BOLD)
- keywordStyler = stylerFactory.createStyler(boldFont, KEYWORD_COLOR, null)
- }
- return keywordStyler
+ // Bug 576866
+// if (keywordStyler===null) {
+// var font = JFaceResources.getFontDescriptor(JFaceResources.TEXT_FONT)
+// var boldFont = font.setStyle(SWT.BOLD)
+// keywordStyler = stylerFactory.createStyler(boldFont, KEYWORD_COLOR, null)
+// }
+// return keywordStyler
}
def protected Styler getTypeStyler() {
- if (typeStyler===null) {
- var font = JFaceResources.getFontDescriptor(JFaceResources.TEXT_FONT)
- var italicFont = font.setStyle(SWT.ITALIC)
- typeStyler = stylerFactory.createStyler(italicFont, null, null)
- }
- return typeStyler
+ // Bug 576866
+// if (typeStyler===null) {
+// var font = JFaceResources.getFontDescriptor(JFaceResources.TEXT_FONT)
+// var italicFont = font.setStyle(SWT.ITALIC)
+// typeStyler = stylerFactory.createStyler(italicFont, null, null)
+// }
+// return typeStyler
}
}

Back to the top