From a73d2bb2dad7f0c0270bbb427ea6cc3f07de0fbe Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Fri, 28 Aug 2015 17:21:41 +0200 Subject: [PATCH] cleanup --- .../ex/InspectionProfileManagerImpl.java | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionProfileManagerImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionProfileManagerImpl.java index c2bb68500ef1..38bb1d7d571a 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionProfileManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionProfileManagerImpl.java @@ -71,7 +71,7 @@ import java.util.concurrent.atomic.AtomicBoolean; public class InspectionProfileManagerImpl extends InspectionProfileManager implements SeverityProvider, PersistentStateComponent { private final InspectionToolRegistrar myRegistrar; - private final SchemesManager mySchemesManager; + private final SchemesManager 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() { + mySchemeManager = schemesManagerFactory.create(INSPECTION_DIR, new BaseSchemeProcessor() { @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 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 profiles = mySchemesManager.getAllSchemes(); + mySchemeManager.loadSchemes(); + Collection 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 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