Merge remote-tracking branch 'origin/master' into develar/is
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Tue, 19 Jul 2016 09:37:07 +0000 (11:37 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Tue, 19 Jul 2016 09:37:07 +0000 (11:37 +0200)
# Conflicts:
# lib/annotations/jdk/java/nio/file/annotations.xml
# platform/configuration-store-impl/src/SchemeManagerImpl.kt
# platform/configuration-store-impl/testSrc/SchemeManagerTest.kt

1  2 
platform/configuration-store-impl/src/SchemeManagerImpl.kt
platform/configuration-store-impl/testSrc/SchemeManagerTest.kt
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/header/InspectionToolsConfigurable.java
platform/platform-impl/src/com/intellij/util/path.kt
platform/platform-resources/src/META-INF/LangExtensionPoints.xml
plugins/settings-repository/testSrc/IcsTestCase.kt

index c0c67f18d57b9ba9c08f63b3cbd65bca16061b2d,0d09b11659f3bd5502db8def2a4c9b757cdd2216..4d3fb2d8247c1751c42b5fb021d2bc05cf3a2465
@@@ -319,7 -324,7 +319,7 @@@ internal class SchemeManagerTest 
    }
  
    private fun createAndLoad(): SchemeManagerImpl<TestScheme, TestScheme> {
-     val schemesManager = SchemeManagerImpl(FILE_SPEC, TestSchemesProcessor(), MockStreamProvider(remoteBaseDir!!.toFile()), localBaseDir!!)
 -    val schemesManager = SchemeManagerImpl<TestScheme, TestScheme>(FILE_SPEC, TestSchemesProcessor(), MockStreamProvider(remoteBaseDir!!), localBaseDir!!)
++    val schemesManager = SchemeManagerImpl(FILE_SPEC, TestSchemesProcessor(), MockStreamProvider(remoteBaseDir!!), localBaseDir!!)
      schemesManager.loadSchemes()
      return schemesManager
    }
index e04949b67cdd33bfe45e90d8406c1ec67c625981,8d94af0995b37a1e0af97e52fb4943919b5de20c..9cdd409e14a8134a5d8ca20e14be10a5a521084c
@@@ -153,8 -149,9 +148,9 @@@ public abstract class InspectionToolsCo
      inspectionProfile.setName(profileDefaultName);
      inspectionProfile.initInspectionTools(project);
      inspectionProfile.setModified(true);
+     inspectionProfile.setProjectLevel(profileManager == myProjectProfileManager);
  
 -    final InspectionProfileImpl modifiableModel = (InspectionProfileImpl)inspectionProfile.getModifiableModel();
 +    final InspectionProfileImpl modifiableModel = inspectionProfile.getModifiableModel();
      modifiableModel.setModified(true);
      addProfile(modifiableModel, inspectionProfile);
      return modifiableModel;