From 10519312379824d648bdcb95ddd15c0d3d406625 Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 24 Nov 2009 17:48:24 +0300 Subject: [PATCH] write file even through only project profile name was changed (IDEA-25257) --- .../intellij/profile/DefaultProjectProfileManager.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/lang-api/src/com/intellij/profile/DefaultProjectProfileManager.java b/platform/lang-api/src/com/intellij/profile/DefaultProjectProfileManager.java index edc7a1dde709..c0a3256a9d45 100644 --- a/platform/lang-api/src/com/intellij/profile/DefaultProjectProfileManager.java +++ b/platform/lang-api/src/com/intellij/profile/DefaultProjectProfileManager.java @@ -59,6 +59,7 @@ public abstract class DefaultProjectProfileManager extends ProjectProfileManager protected Map myProfiles = new HashMap(); protected final DependencyValidationManager myHolder; protected List myProfilesListener = new ArrayList(); + @NonNls private static final String PROJECT_DEFAULT_PROFILE_NAME = "Project Default"; public DefaultProjectProfileManager(final Project project, final String profileType, final DependencyValidationManager holder) { myProject = project; @@ -142,7 +143,7 @@ public abstract class DefaultProjectProfileManager extends ProjectProfileManager } } - if (profiles != null) { + if (profiles != null || !Comparing.strEqual(PROJECT_PROFILE, PROJECT_DEFAULT_PROFILE_NAME)) { DefaultJDOMExternalizer.writeExternal(this, element); final Element version = new Element("version"); version.setAttribute("value", VERSION); @@ -188,13 +189,12 @@ public abstract class DefaultProjectProfileManager extends ProjectProfileManager public Profile getProjectProfileImpl(){ if (isPlatform() || !USE_PROJECT_PROFILE) return myApplicationProfileManager.getRootProfile(); if (PROJECT_PROFILE == null || myProfiles.isEmpty()){ - @NonNls final String projectProfileName = "Project Default"; - setProjectProfile(projectProfileName); + setProjectProfile(PROJECT_DEFAULT_PROFILE_NAME); final Profile projectProfile = myApplicationProfileManager.createProfile(); projectProfile.copyFrom(myApplicationProfileManager.getRootProfile()); projectProfile.setLocal(false); - projectProfile.setName(projectProfileName); - myProfiles.put(projectProfileName, projectProfile); + projectProfile.setName(PROJECT_DEFAULT_PROFILE_NAME); + myProfiles.put(PROJECT_DEFAULT_PROFILE_NAME, projectProfile); } else if (!myProfiles.containsKey(PROJECT_PROFILE)){ final String projectProfileAttempt = myProfiles.keySet().iterator().next(); setProjectProfile(projectProfileAttempt);