This commit is contained in:
Vladimir Krivosheev
2015-08-28 18:15:33 +02:00
parent 3f40420716
commit a73d2bb2da
@@ -71,7 +71,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
public class InspectionProfileManagerImpl extends InspectionProfileManager implements SeverityProvider, PersistentStateComponent<Element> {
private final InspectionToolRegistrar myRegistrar;
private final SchemesManager<Profile, InspectionProfileImpl> mySchemesManager;
private final SchemesManager<Profile, InspectionProfileImpl> mySchemeManager;
private final AtomicBoolean myProfilesAreInitialized = new AtomicBoolean(false);
private final SeverityRegistrar mySeverityRegistrar;
@@ -85,7 +85,7 @@ public class InspectionProfileManagerImpl extends InspectionProfileManager imple
myRegistrar = registrar;
registerProvidedSeverities();
mySchemesManager = schemesManagerFactory.create(INSPECTION_DIR, new BaseSchemeProcessor<InspectionProfileImpl>() {
mySchemeManager = schemesManagerFactory.create(INSPECTION_DIR, new BaseSchemeProcessor<InspectionProfileImpl>() {
@NotNull
@Override
public InspectionProfileImpl readScheme(@NotNull Element element) {
@@ -133,7 +133,7 @@ public class InspectionProfileManagerImpl extends InspectionProfileManager imple
@Override
public void onCurrentSchemeChanged(@Nullable Scheme oldScheme) {
Profile current = mySchemesManager.getCurrentScheme();
Profile current = mySchemeManager.getCurrentScheme();
if (current != null) {
fireProfileChanged((Profile)oldScheme, current, null);
}
@@ -164,7 +164,7 @@ public class InspectionProfileManagerImpl extends InspectionProfileManager imple
@NotNull
public Collection<Profile> getProfiles() {
initProfiles();
return mySchemesManager.getAllSchemes();
return mySchemeManager.getAllSchemes();
}
private volatile boolean LOAD_PROFILES = !ApplicationManager.getApplication().isUnitTestMode();
@@ -177,15 +177,15 @@ public class InspectionProfileManagerImpl extends InspectionProfileManager imple
@Override
public void initProfiles() {
if (myProfilesAreInitialized.getAndSet(true)) {
if (mySchemesManager.getAllSchemes().isEmpty()) {
if (mySchemeManager.getAllSchemes().isEmpty()) {
createDefaultProfile();
}
return;
}
if (!LOAD_PROFILES) return;
mySchemesManager.loadSchemes();
Collection<Profile> profiles = mySchemesManager.getAllSchemes();
mySchemeManager.loadSchemes();
Collection<Profile> profiles = mySchemeManager.getAllSchemes();
if (profiles.isEmpty()) {
createDefaultProfile();
}
@@ -230,7 +230,7 @@ public class InspectionProfileManagerImpl extends InspectionProfileManager imple
@Override
public void updateProfile(@NotNull Profile profile) {
mySchemesManager.addScheme(profile);
mySchemeManager.addScheme(profile);
updateProfileImpl(profile);
}
@@ -286,20 +286,20 @@ public class InspectionProfileManagerImpl extends InspectionProfileManager imple
@Override
public void setRootProfile(String rootProfile) {
Profile current = mySchemesManager.getCurrentScheme();
Profile current = mySchemeManager.getCurrentScheme();
if (current == null || !Comparing.strEqual(rootProfile, current.getName())) {
Profile scheme = getProfile(rootProfile);
if (scheme == null && current == null) {
return;
}
fireProfileChanged(current, scheme, null);
mySchemesManager.setCurrent(scheme, false);
mySchemeManager.setCurrent(scheme, false);
}
}
@Override
public Profile getProfile(@NotNull final String name, boolean returnRootProfileIfNamedIsAbsent) {
Profile found = mySchemesManager.findSchemeByName(name);
Profile found = mySchemeManager.findSchemeByName(name);
if (found != null) return found;
//profile was deleted
if (returnRootProfileIfNamedIsAbsent) {
@@ -311,7 +311,7 @@ public class InspectionProfileManagerImpl extends InspectionProfileManager imple
@NotNull
@Override
public Profile getRootProfile() {
Profile current = mySchemesManager.getCurrentScheme();
Profile current = mySchemeManager.getCurrentScheme();
if (current != null) return current;
Collection<Profile> profiles = getProfiles();
if (profiles.isEmpty()) return createSampleProfile(InspectionProfileImpl.DEFAULT_PROFILE_NAME, null);
@@ -320,21 +320,21 @@ public class InspectionProfileManagerImpl extends InspectionProfileManager imple
@Override
public void deleteProfile(@NotNull final String profile) {
Profile found = mySchemesManager.findSchemeByName(profile);
Profile found = mySchemeManager.findSchemeByName(profile);
if (found != null) {
mySchemesManager.removeScheme(found);
mySchemeManager.removeScheme(found);
}
}
@Override
public void addProfile(@NotNull final Profile profile) {
mySchemesManager.addScheme(profile);
mySchemeManager.addScheme(profile);
}
@Override
@NotNull
public String[] getAvailableProfileNames() {
return ArrayUtil.toStringArray(mySchemesManager.getAllSchemeNames());
return ArrayUtil.toStringArray(mySchemeManager.getAllSchemeNames());
}
@Override