From fd2d54649e961f807bf5748704cfda9bda725406 Mon Sep 17 00:00:00 2001 From: Vivian Kong Date: Mon, 28 May 2007 19:49:08 +0000 Subject: [PATCH] Patch for bug 189216 by Jason Montojo - No label for language mappings table --- .../ui/language/ProjectLanguageMappingWidget.java | 8 ++++++++ .../ui/language/WorkspaceLanguageMappingWidget.java | 9 +++++++++ .../cdt/internal/ui/preferences/PreferencesMessages.java | 3 +++ .../ui/preferences/PreferencesMessages.properties | 3 +++ 4 files changed, 23 insertions(+) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java index 15f9d490019..49c0c460758 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java @@ -25,6 +25,8 @@ import org.eclipse.jface.layout.TableColumnLayout; import org.eclipse.jface.viewers.ColumnWeightData; import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; +import org.eclipse.swt.accessibility.AccessibleAdapter; +import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; @@ -79,6 +81,12 @@ public class ProjectLanguageMappingWidget extends LanguageMappingWidget { fTable = new Table(tableParent, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.FULL_SELECTION); fTable.setHeaderVisible(true); fTable.setLinesVisible(true); + fTable.getAccessible().addAccessibleListener(new AccessibleAdapter() { + public void getName(AccessibleEvent e) { + e.result = PreferencesMessages.ProjectLanguagesPropertyPage_mappingTableTitle; + } + }); + fTable.setToolTipText(PreferencesMessages.ProjectLanguagesPropertyPage_mappingTableTitle); TableColumn configurationColumn = new TableColumn(fTable, SWT.LEAD); configurationColumn.setText(PreferencesMessages.ProjectLanguagesPropertyPage_configurationColumn); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingWidget.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingWidget.java index 9d9e24bede1..bd6eb4511a9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingWidget.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingWidget.java @@ -24,6 +24,8 @@ import org.eclipse.jface.layout.TableColumnLayout; import org.eclipse.jface.viewers.ColumnWeightData; import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; +import org.eclipse.swt.accessibility.AccessibleAdapter; +import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; @@ -61,6 +63,13 @@ public class WorkspaceLanguageMappingWidget extends LanguageMappingWidget { fTable = new Table(tableParent, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.FULL_SELECTION); fTable.setHeaderVisible(true); fTable.setLinesVisible(true); + fTable.getAccessible().addAccessibleListener(new AccessibleAdapter() { + public void getName(AccessibleEvent e) { + e.result = PreferencesMessages.WorkspaceLanguagesPreferencePage_mappingTableTitle; + } + }); + fTable.setToolTipText(PreferencesMessages.WorkspaceLanguagesPreferencePage_mappingTableTitle); + TableColumn contentTypeColumn = new TableColumn(fTable, SWT.LEAD); contentTypeColumn.setText(PreferencesMessages.ProjectLanguagesPropertyPage_contentTypeColumn); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.java index bc2115bfca3..9695f9ef8a2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.java @@ -197,6 +197,7 @@ public final class PreferencesMessages extends NLS { public static String WorkspaceLanguagesPreferencePage_description; public static String WorkspaceLanguagesPreferencePage_missingLanguage; + public static String WorkspaceLanguagesPreferencePage_mappingTableTitle; public static String ProjectLanguagesPropertyPage_description; public static String ProjectLanguagesPropertyPage_configurationColumn; @@ -207,6 +208,7 @@ public final class PreferencesMessages extends NLS { public static String ProjectLanguagesPropertyPage_inheritedWorkspaceMappingsGroup; public static String ProjectLanguagesPropertyPage_overriddenContentType; public static String ProjectLanguagesPropertyPage_missingLanguage; + public static String ProjectLanguagesPropertyPage_mappingTableTitle; public static String ContentTypeMappingsDialog_title; public static String ContentTypeMappingsDialog_configuration; @@ -225,6 +227,7 @@ public final class PreferencesMessages extends NLS { public static String FileLanguagesPropertyPage_configurationColumn; public static String FileLanguagesPropertyPage_defaultMapping; public static String FileLanguagesPropertyPage_missingLanguage; + public static String FileLanguagesPropertyPage_mappingTableTitle; public static String CPluginPreferencePage_caption; public static String CPluginPreferencePage_structuralParseMode_label; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties index 3540aa7fb64..98695678cab 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties @@ -231,6 +231,7 @@ LanguageMappings_missingLanguageTitle = Missing Languages WorkspaceLanguagesPreferencePage_description = These settings are global to the entire workspace. They are overridden by project-specific language mappings. WorkspaceLanguagesPreferencePage_missingLanguage = The workspace contains mappings to one or more languages that are not currently installed. References to these languages will be removed:\n{0} +WorkspaceLanguagesPreferencePage_mappingTableTitle = Language mappings for the workspace ProjectLanguagesPropertyPage_description = These settings are project-specific. The mappings listed here override workspace-wide language mappings. ProjectLanguagesPropertyPage_configurationColumn = Configuration @@ -241,6 +242,7 @@ ProjectLanguagesPropertyPage_removeMappingButton = &Remove ProjectLanguagesPropertyPage_inheritedWorkspaceMappingsGroup = Language settings inherited from the workspace ProjectLanguagesPropertyPage_overriddenContentType = (Overridden) {0} ProjectLanguagesPropertyPage_missingLanguage = This project contains mappings to one or more languages that are not currently installed. References to these languages will be removed:\n{0} +ProjectLanguagesPropertyPage_mappingTableTitle = Language mappings for this project ContentTypeMappingsDialog_title = Add Mapping ContentTypeMappingsDialog_configuration = Configuration @@ -259,6 +261,7 @@ FileLanguagesPropertyPage_inheritedFromFile = Inherited from (Default) ({0}) FileLanguagesPropertyPage_configurationColumn = Configuration FileLanguagesPropertyPage_defaultMapping = (Default) FileLanguagesPropertyPage_missingLanguage = This project contains files that are mapped to one or more languages that are not currently installed. References to these languages will be removed:\n{0} +FileLanguagesPropertyPage_mappingTableTitle = Language mappings for files # Others ProposalFilterPreferencesUtil_defaultFilterName=