From f8d1b6a48f58240b45d2a9caa0f71b511ebab112 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Wed, 19 Aug 2009 22:36:56 +0400 Subject: [PATCH] disable project profiles in platform --- .../profile/DefaultProjectProfileManager.java | 8 ++++++-- .../InspectionProjectProfileManager.java | 13 ------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/lang-api/src/com/intellij/profile/DefaultProjectProfileManager.java b/lang-api/src/com/intellij/profile/DefaultProjectProfileManager.java index a1e58cc849f8..74887ea03596 100644 --- a/lang-api/src/com/intellij/profile/DefaultProjectProfileManager.java +++ b/lang-api/src/com/intellij/profile/DefaultProjectProfileManager.java @@ -51,7 +51,7 @@ public abstract class DefaultProjectProfileManager extends ProjectProfileManager private final String myProfileType; public String PROJECT_PROFILE; - public boolean USE_PROJECT_PROFILE = true; + public boolean USE_PROJECT_PROFILE = !isPlatform(); protected ApplicationProfileManager myApplicationProfileManager; @@ -168,7 +168,7 @@ public abstract class DefaultProjectProfileManager extends ProjectProfileManager @NotNull public Profile getProjectProfileImpl(){ - if (!USE_PROJECT_PROFILE) return myApplicationProfileManager.getRootProfile(); + if (isPlatform() || !USE_PROJECT_PROFILE) return myApplicationProfileManager.getRootProfile(); if (PROJECT_PROFILE == null || myProfiles.isEmpty()){ @NonNls final String projectProfileName = "Project Default"; setProjectProfile(projectProfileName); @@ -186,6 +186,10 @@ public abstract class DefaultProjectProfileManager extends ProjectProfileManager return profile; } + private static boolean isPlatform() { + return System.getProperty("idea.platform.prefix") != null; + } + public void addProfilesListener(ProfileChangeAdapter profilesListener) { myProfilesListener.add(profilesListener); } diff --git a/lang-impl/src/com/intellij/profile/codeInspection/InspectionProjectProfileManager.java b/lang-impl/src/com/intellij/profile/codeInspection/InspectionProjectProfileManager.java index 0d4428a7ac6e..1affff6d7c0f 100644 --- a/lang-impl/src/com/intellij/profile/codeInspection/InspectionProjectProfileManager.java +++ b/lang-impl/src/com/intellij/profile/codeInspection/InspectionProjectProfileManager.java @@ -33,7 +33,6 @@ import com.intellij.openapi.wm.impl.status.TogglePopupHintsPanel; import com.intellij.packageDependencies.DependencyValidationManager; import com.intellij.profile.DefaultProjectProfileManager; import com.intellij.profile.Profile; -import com.intellij.profile.codeInspection.ui.ProjectInspectionToolsConfigurable; import com.intellij.psi.PsiElement; import org.jdom.Element; import org.jetbrains.annotations.NonNls; @@ -214,18 +213,6 @@ public class InspectionProjectProfileManager extends DefaultProjectProfileManage super.readExternal(element); } - @NotNull - @Override - public Profile getProjectProfileImpl() { - try { - ProjectInspectionToolsConfigurable.getInstance(myProject); - } - catch (IllegalStateException e) { //disable project profile in platform - USE_PROJECT_PROFILE = false; - } - return super.getProjectProfileImpl(); - } - public void writeExternal(final Element element) throws WriteExternalException { super.writeExternal(element); mySeverityRegistrar.writeExternal(element);