mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 10:16:03 +02:00
Code Issues Wiki Activity

Bug 279607 Code Formatter should treat DefaultScope formatter profiles as built-in

Browse source
This commit is contained in:
James Blackburn 2009-06-28 15:56:41 +00:00
parent 1205a5d0fa
commit 127db8e30b
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterProfileManager.java
View file

@ -13,9 +13,11 @@ package org.eclipse.cdt.internal.ui.preferences.formatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.preferences.DefaultScope; import org.eclipse.core.runtime.preferences.DefaultScope;
import org.eclipse.core.runtime.preferences.IScopeContext; import org.eclipse.core.runtime.preferences.IScopeContext;
@ -58,6 +60,25 @@ public class FormatterProfileManager extends ProfileManager {
profiles.add(gnuProfile); profiles.add(gnuProfile);
final Profile whitesmithsProfile= new BuiltInProfile(WHITESMITHS_PROFILE, FormatterMessages.ProfileManager_whitesmiths_profile_name, getWhitesmithsSettings(), 2, profileVersioner.getCurrentVersion(), profileVersioner.getProfileKind()); final Profile whitesmithsProfile= new BuiltInProfile(WHITESMITHS_PROFILE, FormatterMessages.ProfileManager_whitesmiths_profile_name, getWhitesmithsSettings(), 2, profileVersioner.getCurrentVersion(), profileVersioner.getProfileKind());
profiles.add(whitesmithsProfile); profiles.add(whitesmithsProfile);
// Add the Profiles which are at default scope and hence are contributed by a product.
try {
List<Profile> defaultProfiles= new FormatterProfileStore(profileVersioner).readProfiles(new DefaultScope());
if (defaultProfiles != null) {
Map<String, Profile> profMap= new LinkedHashMap<String, Profile>();
// Add the already loaded / created profiles to a map
for (Profile p : profiles)
profMap.put(p.getID(), p);
// Default profiles override any colliding profiles already in the list
for (Profile p : defaultProfiles)
profMap.put(p.getID(), new BuiltInProfile(p.getName(), p.getName(), p.getSettings(), 2, profileVersioner.getCurrentVersion(), profileVersioner.getProfileKind()));
profiles= new ArrayList<Profile>(profMap.values());
}
} catch (CoreException e) {
CUIPlugin.log(e);
}
return profiles; return profiles;
} }

9
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileConfigurationBlock.java
View file

@ -21,7 +21,6 @@ import java.util.Observer;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ProjectScope; import org.eclipse.core.resources.ProjectScope;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.preferences.DefaultScope;
import org.eclipse.core.runtime.preferences.IScopeContext; import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener; import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent; import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
@ -281,14 +280,6 @@ public abstract class ProfileConfigurationBlock {
} catch (CoreException e) { } catch (CoreException e) {
CUIPlugin.log(e); CUIPlugin.log(e);
} }
if (profiles == null) {
try {
// bug 129427
profiles= fProfileStore.readProfiles(new DefaultScope());
} catch (CoreException e) {
CUIPlugin.log(e);
}
}
if (profiles == null) if (profiles == null)
profiles= new ArrayList<Profile>(); profiles= new ArrayList<Profile>();