From 8c893120ae364549ce40b56c4545629c5e308607 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Tue, 1 May 2012 22:31:51 -0400 Subject: [PATCH] preparations for merge to master --- .../icons/obj16/search.gif | Bin .../org.eclipse.cdt.make.ui/plugin.properties | 2 + build/org.eclipse.cdt.make.ui/plugin.xml | 9 ++ .../AbstractBuiltinSpecsDetector.java | 2 +- .../{inspect_system.gif => inspect_sys.gif} | Bin .../plugin.properties | 3 - .../plugin.xml | 88 ++++++++---------- .../icons/obj16/ls_entries_provider.gif | Bin 371 -> 0 bytes .../icons/obj16/provider_ls_obj.gif | Bin 186 -> 0 bytes .../ovr16/{edited_ov.gif => edited_ovr.gif} | Bin core/org.eclipse.cdt.ui/plugin.properties | 1 - .../viewsupport/ProblemsLabelDecorator.java | 4 +- .../org/eclipse/cdt/ui/CDTSharedImages.java | 21 ++--- 13 files changed, 61 insertions(+), 69 deletions(-) rename build/{org.eclipse.cdt.managedbuilder.ui => org.eclipse.cdt.make.ui}/icons/obj16/search.gif (100%) rename build/org.eclipse.cdt.managedbuilder.ui/icons/obj16/{inspect_system.gif => inspect_sys.gif} (100%) delete mode 100644 core/org.eclipse.cdt.ui/icons/obj16/ls_entries_provider.gif delete mode 100644 core/org.eclipse.cdt.ui/icons/obj16/provider_ls_obj.gif rename core/org.eclipse.cdt.ui/icons/ovr16/{edited_ov.gif => edited_ovr.gif} (100%) diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/obj16/search.gif b/build/org.eclipse.cdt.make.ui/icons/obj16/search.gif similarity index 100% rename from build/org.eclipse.cdt.managedbuilder.ui/icons/obj16/search.gif rename to build/org.eclipse.cdt.make.ui/icons/obj16/search.gif diff --git a/build/org.eclipse.cdt.make.ui/plugin.properties b/build/org.eclipse.cdt.make.ui/plugin.properties index 21b341f00ec..a931132ab90 100644 --- a/build/org.eclipse.cdt.make.ui/plugin.properties +++ b/build/org.eclipse.cdt.make.ui/plugin.properties @@ -43,6 +43,8 @@ LastTargetBuild.description=Rebuild the last make target for the selected contai PreferenceBuildSettings.name=Settings ErrorParsersTab.name=Error Parsers ErrorParsersTab.tooltip=Error Parsers scan build output and report errors in Problems view +LanguageSettingsProvidersTab.name=Discovery +LanguageSettingsProvidersTab.tooltip=Language settings providers PreferenceMakeProject.name=New Make Projects PreferenceMake.name=Make Targets diff --git a/build/org.eclipse.cdt.make.ui/plugin.xml b/build/org.eclipse.cdt.make.ui/plugin.xml index 511eb8174e3..604f6f26e62 100644 --- a/build/org.eclipse.cdt.make.ui/plugin.xml +++ b/build/org.eclipse.cdt.make.ui/plugin.xml @@ -461,6 +461,7 @@ helpId="cdt_u_prop_pns_sym" parent="org.eclipse.cdt.make.internal.ui.properties.PathAndSymbolPage" tooltip="%Symbols.tooltip"/> + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/core/org.eclipse.cdt.ui/icons/obj16/ls_entries_provider.gif b/core/org.eclipse.cdt.ui/icons/obj16/ls_entries_provider.gif deleted file mode 100644 index 4832572f2118e3e3bd05bd718ed656576c3c4a53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 371 zcmZ?wbhEHb6krfwSgOaMku+_Che%bie|2#{b%}ppcz@*{`l= zUE9F6rjc!WliT_h_PMRDi#nV)b#iU#=3d_Aw5G>ldq2;He!DFbY|Ccv`TwZ?|D%RG z&%fV)`QzcMACKOAfAZ$%vv)uLzhC|Q{f|HIkG}fw^UsH)Z$JI|@b&knufMJ}l zr)oo!s%n^+(o8YM$_hnAA!%XV#nRFWavW-YCxzrX!|zxvtj4Szly-PFmorJH+uKhOV1_5U9={CR(L zbv^6a2DUYgZ0lRtC#EqhuVVTC|33rKK=CIFBLjmVgAPas$W8`U^8}T?l+1Y~F;9Tj9mdfG~EN$3i2aI`GVt=ykbz` list = provider.getSettingEntries(cfgDescription, rc, languageId); - if (list!=null) { + if (list != null) { List listDefault = provider.getSettingEntries(cfgDescription, rc.getParent(), languageId); // != is OK here due as the equal lists will have the same reference in WeakHashSet if (list != listDefault) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTSharedImages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTSharedImages.java index ab44e87cc30..d9fdffa753c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTSharedImages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTSharedImages.java @@ -172,6 +172,8 @@ public class CDTSharedImages { public static final String IMG_OBJS_CORRECTION_RENAME = "icons/obj16/correction_rename.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_CORRECTION_LINKED_RENAME = "icons/obj16/correction_linked_rename.gif"; //$NON-NLS-1$ + /** @since 5.4 */ + public static final String IMG_ETOOL_PROJECT = "icons/etool16/prj_obj.gif"; //$NON-NLS-1$ public static final String IMG_VIEW_BUILD_CONSOLE = "icons/view16/buildconsole.gif"; //$NON-NLS-1$ // Images for file list control @@ -186,6 +188,12 @@ public class CDTSharedImages { public static final String IMG_OVR_ERROR = "icons/ovr16/error_co.gif"; //$NON-NLS-1$ public static final String IMG_OVR_SETTING = "icons/ovr16/setting_nav.gif"; //$NON-NLS-1$ public static final String IMG_OVR_INACTIVE = "icons/ovr16/inactive_co.gif"; //$NON-NLS-1$ + /** @since 5.4 */ + public static final String IMG_OVR_PARENT = "icons/ovr16/path_inherit_co.gif"; //$NON-NLS-1$ + /** @since 5.4 */ + public static final String IMG_OVR_EDITED = "icons/ovr16/edited_ovr.gif"; //$NON-NLS-1$ + /** @since 5.4 */ + public static final String IMG_OVR_USER = "icons/ovr16/person_ovr.gif"; //$NON-NLS-1$ // Pin & Clone public static final String IMG_THREAD_SUSPENDED_R_PINNED = "icons/obj16/threads_obj_r.gif"; //$NON-NLS-1$ @@ -210,12 +218,7 @@ public class CDTSharedImages { public static final String IMG_VIEW_PIN_ACTION_B = "icons/obj16/toolbar_pinned_b.gif"; //$NON-NLS-1$ public static final String IMG_VIEW_PIN_ACTION_MULTI = "icons/obj16/toolbar_pinned_multi.gif"; //$NON-NLS-1$ - // Language Settings Images - /** @since 5.4 */ - public static final String IMG_OBJS_LANG_SETTINGS_PROVIDER = "icons/obj16/ls_entries_provider.gif"; //$NON-NLS-1$ - /** @since 5.4 */ - public static final String IMG_ETOOL_PROJECT = "icons/etool16/prj_obj.gif"; //$NON-NLS-1$ - + // Language Settings Images extras /** @since 5.4 */ public static final String IMG_OVR_GLOBAL = "icons/ovr16/global_ovr.gif"; //$NON-NLS-1$ /** @since 5.4 */ @@ -225,8 +228,6 @@ public class CDTSharedImages { /** @since 5.4 */ public static final String IMG_OVR_CONFIGURATION = "icons/ovr16/cfg_ovr.gif"; //$NON-NLS-1$ /** @since 5.4 */ - public static final String IMG_OVR_PARENT = "icons/ovr16/path_inherit_co.gif"; //$NON-NLS-1$ - /** @since 5.4 */ public static final String IMG_OVR_INDEXED = "icons/ovr16/indexedFile.gif"; //$NON-NLS-1$ /** @since 5.4 */ public static final String IMG_OVR_REFERENCE = "icons/ovr16/referencedby_co.gif"; //$NON-NLS-1$ @@ -237,11 +238,7 @@ public class CDTSharedImages { /** @since 5.4 */ public static final String IMG_OVR_LOCK = "icons/ovr16/lock_ovr.gif"; //$NON-NLS-1$ /** @since 5.4 */ - public static final String IMG_OVR_EDITED = "icons/ovr16/edited_ov.gif"; //$NON-NLS-1$ - /** @since 5.4 */ public static final String IMG_OVR_EMPTY = "icons/ovr16/empty_ovr.png"; //$NON-NLS-1$ - /** @since 5.4 */ - public static final String IMG_OVR_USER = "icons/ovr16/person_ovr.gif"; //$NON-NLS-1$ /** * The method finds URL of the image corresponding to the key which could be project-relative path