From c7d2fbaa32ba3fbd0d80c25ccc1231a3e8c78f39 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Wed, 15 Aug 2012 11:41:46 +0400 Subject: [PATCH] do not create profile_settings.xml when default was not changed (IDEA-90160) --- .../intellij/profile/DefaultProjectProfileManager.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/platform/lang-api/src/com/intellij/profile/DefaultProjectProfileManager.java b/platform/lang-api/src/com/intellij/profile/DefaultProjectProfileManager.java index 02f8b8973ad3..3fce519df4c9 100644 --- a/platform/lang-api/src/com/intellij/profile/DefaultProjectProfileManager.java +++ b/platform/lang-api/src/com/intellij/profile/DefaultProjectProfileManager.java @@ -132,7 +132,7 @@ public abstract class DefaultProjectProfileManager extends ProjectProfileManager if (projectProfile != null) { final Element profileElement = new Element(PROFILE); projectProfile.writeExternal(profileElement); - boolean hasSmthToSave = sortedProfiles.size() > 1 || !Comparing.strEqual(PROJECT_PROFILE, PROJECT_DEFAULT_PROFILE_NAME); + boolean hasSmthToSave = sortedProfiles.size() > 1 || isDefaultProfileUsed(); if (!hasSmthToSave) { for (Object child : profileElement.getChildren()) { if (!((Element)child).getName().equals("option")) { @@ -152,7 +152,7 @@ public abstract class DefaultProjectProfileManager extends ProjectProfileManager } } - if (profiles != null || !Comparing.strEqual(PROJECT_PROFILE, PROJECT_DEFAULT_PROFILE_NAME)) { + if (profiles != null || isDefaultProfileUsed()) { DefaultJDOMExternalizer.writeExternal(this, element); final Element version = new Element("version"); version.setAttribute("value", VERSION); @@ -160,6 +160,10 @@ public abstract class DefaultProjectProfileManager extends ProjectProfileManager } } + private boolean isDefaultProfileUsed() { + return PROJECT_PROFILE != null && !Comparing.strEqual(PROJECT_PROFILE, PROJECT_DEFAULT_PROFILE_NAME); + } + @NotNull @Override public NamedScopesHolder getScopesManager() {