diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractBuildCommandParser.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractBuildCommandParser.java index 4eafdbffaf3..758081cd98d 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractBuildCommandParser.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractBuildCommandParser.java @@ -152,7 +152,7 @@ public abstract class AbstractBuildCommandParser extends AbstractLanguageSetting } @Override - protected void setSettingEntries(List entries) { + protected void setSettingEntries(List entries) { IResource rc = null; switch (getResourceScope()) { case FILE: diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractBuiltinSpecsDetector.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractBuiltinSpecsDetector.java index 696b57563e4..48057a095d6 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractBuiltinSpecsDetector.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractBuiltinSpecsDetector.java @@ -760,7 +760,7 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti } @Override - protected void setSettingEntries(List entries) { + protected void setSettingEntries(List entries) { // Built-in specs detectors collect entries not per line but for the whole output // so collect them to save later when output finishes if (entries != null) { diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractLanguageSettingsOutputScanner.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractLanguageSettingsOutputScanner.java index 8181a9e42ce..8198625a18a 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractLanguageSettingsOutputScanner.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractLanguageSettingsOutputScanner.java @@ -608,7 +608,7 @@ public abstract class AbstractLanguageSettingsOutputScanner extends LanguageSett * * @param entries - language settings entries to set. */ - protected void setSettingEntries(List entries) { + protected void setSettingEntries(List entries) { setSettingEntries(currentCfgDescription, currentResource, currentLanguageId, entries); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/ILanguageSettingsEditableProvider.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/ILanguageSettingsEditableProvider.java index fe282cb6360..2e1e5b277c3 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/ILanguageSettingsEditableProvider.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/ILanguageSettingsEditableProvider.java @@ -8,7 +8,6 @@ * Contributors: * Andrew Gvozdev - initial API and implementation *******************************************************************************/ - package org.eclipse.cdt.core.language.settings.providers; import java.util.List; @@ -23,7 +22,6 @@ import org.eclipse.core.resources.IResource; * their settings themselves and not providing such option to the user. * * @since 5.4 - * */ public interface ILanguageSettingsEditableProvider extends ILanguageSettingsBroadcastingProvider, Cloneable { @Override @@ -43,7 +41,8 @@ public interface ILanguageSettingsEditableProvider extends ILanguageSettingsBroa * to be defined as default entries for languages. * @param entries - language settings entries to set. */ - public void setSettingEntries(ICConfigurationDescription cfgDescription, IResource rc, String languageId, List entries); + public void setSettingEntries(ICConfigurationDescription cfgDescription, IResource rc, String languageId, + List entries); /** * Shallow clone of the provider. "Shallow" is defined here as the exact copy except that diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsSerializableProvider.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsSerializableProvider.java index 90077a18fb7..dcd8001d6ac 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsSerializableProvider.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsSerializableProvider.java @@ -105,22 +105,23 @@ public class LanguageSettingsSerializableProvider extends LanguageSettingsBasePr } /** - * Set the language scope of the provider. + * Sets the language scope of the provider. * * @param languages - the list of languages this provider provides for. * If {@code null}, the provider provides for any language. * * @see #getLanguageScope() */ - public void setLanguageScope(List languages) { - if (languages==null) + public void setLanguageScope(List languages) { + if (languages == null) { this.languageScope = null; - else - this.languageScope = new ArrayList(languages); + } else { + this.languageScope = new ArrayList<>(languages); + } } /** - * Clear all the entries for all configurations, all resources and all languages. + * Clears all the entries for all configurations, all resources and all languages. */ public void clear() { fStorage.clear(); @@ -141,7 +142,8 @@ public class LanguageSettingsSerializableProvider extends LanguageSettingsBasePr * to be defined for the language scope. See {@link #getLanguageScope()} * @param entries - language settings entries to set. */ - public void setSettingEntries(ICConfigurationDescription cfgDescription, IResource rc, String languageId, List entries) { + public void setSettingEntries(ICConfigurationDescription cfgDescription, IResource rc, String languageId, + List entries) { String rcProjectPath = rc!=null ? rc.getProjectRelativePath().toString() : null; fStorage.setSettingEntries(rcProjectPath, languageId, entries); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsStorage.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsStorage.java index d1dd06f6fce..50bbbb631a7 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsStorage.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsStorage.java @@ -69,8 +69,8 @@ public class LanguageSettingsStorage implements Cloneable { * @param entries - list of entries to sort. * @return - sorted entries. */ - private List sortEntries(List entries) { - List sortedEntries = new ArrayList(entries); + private List sortEntries(List entries) { + List sortedEntries = new ArrayList<>(entries); Collections.sort(sortedEntries, new Comparator() { /** * This comparator sorts by kinds first and the macros are sorted additionally by name. @@ -79,7 +79,7 @@ public class LanguageSettingsStorage implements Cloneable { public int compare(ICLanguageSettingEntry entry0, ICLanguageSettingEntry entry1) { int kind0 = entry0.getKind(); int kind1 = entry1.getKind(); - if (kind0==ICSettingEntry.MACRO && kind1==ICSettingEntry.MACRO) { + if (kind0 == ICSettingEntry.MACRO && kind1 == ICSettingEntry.MACRO) { return entry0.getName().compareTo(entry1.getName()); } @@ -98,11 +98,12 @@ public class LanguageSettingsStorage implements Cloneable { * to be defined for the language scope. * @param entries - language settings entries to set. */ - public void setSettingEntries(String rcProjectPath, String languageId, List entries) { + public void setSettingEntries(String rcProjectPath, String languageId, + List entries) { synchronized (fStorage) { if (entries!=null) { Map> langMap = fStorage.get(languageId); - if (langMap==null) { + if (langMap == null) { langMap = new HashMap>(); fStorage.put(languageId, langMap); } @@ -111,9 +112,9 @@ public class LanguageSettingsStorage implements Cloneable { } else { // reduct the empty maps in the tables Map> langMap = fStorage.get(languageId); - if (langMap!=null) { + if (langMap != null) { langMap.remove(rcProjectPath); - if (langMap.size()==0) { + if (langMap.isEmpty()) { fStorage.remove(languageId); } }