Skip to content

Commit d564ac0

Browse files
committed
Declare constant in CTabFolder to be public
1 parent 3dd9638 commit d564ac0

File tree

5 files changed

+8
-15
lines changed

5 files changed

+8
-15
lines changed

bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/internal/workbench/renderers/swt/BasicPartList.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,8 @@ private boolean shouldHideIcons() {
229229
}
230230

231231
// Get the preference value for hiding icons in view tabs
232-
// Note: The preference qualifier is hardcoded here as it's private in CTabRendering
233232
return Platform.getPreferencesService().getBoolean(
234-
"org.eclipse.e4.ui.workbench.renderers.swt", //$NON-NLS-1$
233+
CTabRendering.PREF_QUALIFIER_ECLIPSE_E4_UI_WORKBENCH_RENDERERS_SWT,
235234
CTabRendering.HIDE_ICONS_FOR_VIEW_TABS,
236235
CTabRendering.HIDE_ICONS_FOR_VIEW_TABS_DEFAULT,
237236
null);

bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/CTabRendering.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class CTabRendering extends CTabFolderRenderer implements ICTabRendering,
4747
/**
4848
* The preference qualifier.
4949
*/
50-
private static final String PREF_QUALIFIER_ECLIPSE_E4_UI_WORKBENCH_RENDERERS_SWT = "org.eclipse.e4.ui.workbench.renderers.swt"; //$NON-NLS-1$
50+
public static final String PREF_QUALIFIER_ECLIPSE_E4_UI_WORKBENCH_RENDERERS_SWT = "org.eclipse.e4.ui.workbench.renderers.swt"; //$NON-NLS-1$
5151

5252
/**
5353
* A named preference for setting CTabFolder's to be rendered with rounded

bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRenderer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public class StackRenderer extends LazyStackRenderer {
161161
private static final String TAB_FONT_KEY = "org.eclipse.ui.workbench.TAB_TEXT_FONT"; //$NON-NLS-1$
162162

163163
@Inject
164-
@Preference(nodePath = "org.eclipse.e4.ui.workbench.renderers.swt")
164+
@Preference(nodePath = CTabRendering.PREF_QUALIFIER_ECLIPSE_E4_UI_WORKBENCH_RENDERERS_SWT)
165165
private IEclipsePreferences preferences;
166166

167167
@Inject

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/WorkbookEditorsHandler.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
3434
import org.eclipse.core.runtime.preferences.InstanceScope;
3535
import org.eclipse.e4.ui.model.application.ui.basic.MPart;
36+
import org.eclipse.e4.ui.workbench.renderers.swt.CTabRendering;
3637
import org.eclipse.e4.ui.workbench.renderers.swt.StackRenderer;
3738
import org.eclipse.jface.viewers.BoldStylerProvider;
3839
import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
@@ -62,11 +63,6 @@
6263
*/
6364
public class WorkbookEditorsHandler extends FilteredTableBaseHandler {
6465

65-
/**
66-
* Preference node for the workbench SWT renderer
67-
*/
68-
private static final String ORG_ECLIPSE_E4_UI_WORKBENCH_RENDERERS_SWT = "org.eclipse.e4.ui.workbench.renderers.swt"; //$NON-NLS-1$
69-
7066
/**
7167
* Id for the command that opens the editor drop down
7268
*/
@@ -98,7 +94,7 @@ public class WorkbookEditorsHandler extends FilteredTableBaseHandler {
9894
* @return Returns the enableMRU.
9995
*/
10096
private static boolean isMruEnabled() {
101-
IEclipsePreferences preferences = InstanceScope.INSTANCE.getNode(ORG_ECLIPSE_E4_UI_WORKBENCH_RENDERERS_SWT);
97+
IEclipsePreferences preferences = InstanceScope.INSTANCE.getNode(CTabRendering.PREF_QUALIFIER_ECLIPSE_E4_UI_WORKBENCH_RENDERERS_SWT);
10298
boolean initialMRUValue = preferences.getBoolean(StackRenderer.MRU_KEY_DEFAULT, StackRenderer.MRU_DEFAULT);
10399
return preferences.getBoolean(StackRenderer.MRU_KEY, initialMRUValue);
104100
}

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/dialogs/ViewsPreferencePage.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@
9292
*/
9393
public class ViewsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
9494

95-
private static final String PREF_QUALIFIER_ECLIPSE_E4_UI_WORKBENCH_RENDERERS_SWT = "org.eclipse.e4.ui.workbench.renderers.swt"; //$NON-NLS-1$
96-
9795
private static final String E4_THEME_EXTENSION_POINT = "org.eclipse.e4.ui.css.swt.theme"; //$NON-NLS-1$
9896

9997
/** The workbench theme engine; may be {@code null} if no engine */
@@ -248,7 +246,7 @@ protected void createHideIconsForViewTabs(Composite composite) {
248246
}
249247

250248
private boolean getSwtRendererPreference(String prefName, boolean defaultValue) {
251-
return Platform.getPreferencesService().getBoolean(PREF_QUALIFIER_ECLIPSE_E4_UI_WORKBENCH_RENDERERS_SWT,
249+
return Platform.getPreferencesService().getBoolean(CTabRendering.PREF_QUALIFIER_ECLIPSE_E4_UI_WORKBENCH_RENDERERS_SWT,
252250
prefName, defaultValue, null);
253251
}
254252

@@ -332,7 +330,7 @@ public void init(IWorkbench workbench) {
332330
@Override
333331
public boolean performOk() {
334332
IEclipsePreferences prefs = InstanceScope.INSTANCE
335-
.getNode(PREF_QUALIFIER_ECLIPSE_E4_UI_WORKBENCH_RENDERERS_SWT);
333+
.getNode(CTabRendering.PREF_QUALIFIER_ECLIPSE_E4_UI_WORKBENCH_RENDERERS_SWT);
336334
if (isThemingPossible()) {
337335
ITheme theme = getSelectedTheme();
338336
if (theme != null) {
@@ -441,7 +439,7 @@ private void setColorsAndFontsTheme(ColorsAndFontsTheme theme) {
441439
@Override
442440
protected void performDefaults() {
443441
IEclipsePreferences defaultPrefs = DefaultScope.INSTANCE
444-
.getNode(PREF_QUALIFIER_ECLIPSE_E4_UI_WORKBENCH_RENDERERS_SWT);
442+
.getNode(CTabRendering.PREF_QUALIFIER_ECLIPSE_E4_UI_WORKBENCH_RENDERERS_SWT);
445443
if (isThemingPossible()) {
446444
setColorsAndFontsTheme(currentColorsAndFontsTheme);
447445

0 commit comments

Comments
 (0)