diff options
| author | Jonah Graham | 2018-11-23 13:04:51 +0000 |
|---|---|---|
| committer | Jonah Graham | 2018-11-23 13:59:46 +0000 |
| commit | 3caea240a38caa9b4913481ba9fb41d9b57a032c (patch) | |
| tree | 240ffcb07ecd6e2d5029743bacd81e280e07adf8 /core/org.eclipse.cdt.core/model | |
| parent | ff75ae80fa44dfc925064f7ca0169ac80997bc77 (diff) | |
| download | org.eclipse.cdt-3caea240a38caa9b4913481ba9fb41d9b57a032c.tar.gz org.eclipse.cdt-3caea240a38caa9b4913481ba9fb41d9b57a032c.tar.xz org.eclipse.cdt-3caea240a38caa9b4913481ba9fb41d9b57a032c.zip | |
Bug 540373: Format some Java files that were missed
Some files which has other cleanups applied meant they needed to be
reformatted again. e.g. the removing of type parameters shortened
some lines of code that meant the wrapping changed.
Change-Id: I68ca09567b9530cc2a085c33923642b6de2ec77b
Diffstat (limited to 'core/org.eclipse.cdt.core/model')
3 files changed, 3 insertions, 6 deletions
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/ProjectLanguageConfiguration.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/ProjectLanguageConfiguration.java index 14afe485448..d0fe1db6558 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/ProjectLanguageConfiguration.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/ProjectLanguageConfiguration.java @@ -244,8 +244,7 @@ public class ProjectLanguageConfiguration { * @param file */ public void setFileMappings(IFile file, Map<String, String> mappings) { - fFileConfigurationMappings.put(file.getProjectRelativePath().toPortableString(), - new TreeMap<>(mappings)); + fFileConfigurationMappings.put(file.getProjectRelativePath().toPortableString(), new TreeMap<>(mappings)); } private Map<String, Map<String, String>> copyLanguageMappings(Map<String, Map<String, String>> mappings, diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsProvidersSerializer.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsProvidersSerializer.java index 194f82d042f..02110ec446f 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsProvidersSerializer.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsProvidersSerializer.java @@ -1208,8 +1208,7 @@ public class LanguageSettingsProvidersSerializer { String[] ids = ((ILanguageSettingsProvidersKeeper) cfgDescription) .getDefaultLanguageSettingsProvidersIds(); if (ids != null) { - List<ILanguageSettingsProvider> providers = new ArrayList<>( - ids.length); + List<ILanguageSettingsProvider> providers = new ArrayList<>(ids.length); for (String id : ids) { if (LanguageSettingsExtensionManager.isPreferShared(id)) { providers.add(LanguageSettingsManager.getWorkspaceProvider(id)); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/xml/XmlProjectDescriptionStorage.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/xml/XmlProjectDescriptionStorage.java index de82650c681..6a16807b649 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/xml/XmlProjectDescriptionStorage.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/xml/XmlProjectDescriptionStorage.java @@ -190,8 +190,7 @@ public class XmlProjectDescriptionStorage extends AbstractCProjectDescriptionSto /** A soft reference to the read-only project description * Volatile provides a memory barrier in Java 5+ */ - private volatile Reference<ICProjectDescription> fProjectDescription = new SoftReference<>( - null); + private volatile Reference<ICProjectDescription> fProjectDescription = new SoftReference<>(null); /** The last modification stamp of the .cproject project description file */ private volatile long projectModificaitonStamp = IResource.NULL_STAMP; |