MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-21 14:01:44 +07:00
Code Issues Packages Projects Releases Wiki Activity

deprecate ModifiableModelsProvider$SERVICE

Browse Source 
GitOrigin-RevId: b1c511255b9583e42667b46b5baaf812559f1b4c
This commit is contained in:
Daniil Ovchinnikov
2022-05-17 19:29:42 +02:00
committed by intellij-monorepo-bot
parent 1eb128066e
commit d207feb0c1
4 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
platform/lang-api/src/com/intellij/openapi/roots/ModifiableModelsProvider.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.openapi.roots;
import com.intellij.facet.ModifiableFacetModel;
@@ -14,15 +14,24 @@ import org.jetbrains.annotations.NotNull;
* @author Dennis.Ushakov
*/
public interface ModifiableModelsProvider {
/**
* @deprecated use {@link ModifiableModelsProvider#getInstance()} instead
*/
@Deprecated(forRemoval = true)
final class SERVICE {
private SERVICE() {
}
public static ModifiableModelsProvider getInstance() {
return ApplicationManager.getApplication().getService(ModifiableModelsProvider.class);
return ModifiableModelsProvider.getInstance();
}
}
static ModifiableModelsProvider getInstance() {
return ApplicationManager.getApplication().getService(ModifiableModelsProvider.class);
}
ModifiableRootModel getModuleModifiableModel(@NotNull Module module);
void commitModuleModifiableModel(@NotNull ModifiableRootModel model);
void disposeModuleModifiableModel(@NotNull ModifiableRootModel model);

4
python/pluginCore/impl/src/com/jetbrains/python/facet/PythonFacetUtil.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.jetbrains.python.facet;
import com.intellij.openapi.application.ApplicationManager;
@@ -39,7 +39,7 @@ public class PythonFacetUtil {
}
}
if (name != null) {
final ModifiableModelsProvider provider = ModifiableModelsProvider.SERVICE.getInstance();
final ModifiableModelsProvider provider = ModifiableModelsProvider.getInstance();
final LibraryTable.ModifiableModel libraryTableModifiableModel = provider.getLibraryTableModifiableModel();
Library library = libraryTableModifiableModel.getLibraryByName(name);
provider.disposeLibraryTableModifiableModel(libraryTableModifiableModel);

10
python/pluginCore/impl/src/com/jetbrains/python/facet/PythonSdkTableListener.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.jetbrains.python.facet;
import com.intellij.openapi.application.ApplicationManager;
@@ -39,7 +39,7 @@ public class PythonSdkTableListener implements ProjectJdkTable.Listener {
}
static Library addLibrary(Sdk sdk) {
final LibraryTable.ModifiableModel libraryTableModel = ModifiableModelsProvider.SERVICE.getInstance().getLibraryTableModifiableModel();
final LibraryTable.ModifiableModel libraryTableModel = ModifiableModelsProvider.getInstance().getLibraryTableModifiableModel();
final Library library = libraryTableModel.createLibrary(PythonFacetUtil.getFacetLibraryName(sdk.getName()));
final Library.ModifiableModel model = library.getModifiableModel();
for (String url : sdk.getRootProvider().getUrls(OrderRootType.CLASSES)) {
@@ -52,7 +52,7 @@ public class PythonSdkTableListener implements ProjectJdkTable.Listener {
}
static void updateLibrary(Sdk sdk) {
final LibraryTable.ModifiableModel libraryTableModel = ModifiableModelsProvider.SERVICE.getInstance().getLibraryTableModifiableModel();
final LibraryTable.ModifiableModel libraryTableModel = ModifiableModelsProvider.getInstance().getLibraryTableModifiableModel();
final Library library = libraryTableModel.getLibraryByName(PythonFacetUtil.getFacetLibraryName(sdk.getName()));
if (library == null) return;
final Library.ModifiableModel model = library.getModifiableModel();
@@ -73,7 +73,7 @@ public class PythonSdkTableListener implements ProjectJdkTable.Listener {
private static void removeLibrary(final Sdk sdk) {
ApplicationManager.getApplication().invokeLater(() -> ApplicationManager.getApplication().runWriteAction(() -> {
final LibraryTable.ModifiableModel libraryTableModel =
ModifiableModelsProvider.SERVICE.getInstance().getLibraryTableModifiableModel();
ModifiableModelsProvider.getInstance().getLibraryTableModifiableModel();
final Library library = libraryTableModel.getLibraryByName(PythonFacetUtil.getFacetLibraryName(sdk.getName()));
if (library != null) {
libraryTableModel.removeLibrary(library);
@@ -85,7 +85,7 @@ public class PythonSdkTableListener implements ProjectJdkTable.Listener {
private static void renameLibrary(final Sdk sdk, final String previousName) {
ApplicationManager.getApplication().invokeLater(() -> ApplicationManager.getApplication().runWriteAction(() -> {
final LibraryTable.ModifiableModel libraryTableModel =
ModifiableModelsProvider.SERVICE.getInstance().getLibraryTableModifiableModel();
ModifiableModelsProvider.getInstance().getLibraryTableModifiableModel();
final Library library = libraryTableModel.getLibraryByName(PythonFacetUtil.getFacetLibraryName(previousName));
if (library != null) {
final Library.ModifiableModel model = library.getModifiableModel();

6
python/src/com/jetbrains/python/facet/FacetLibraryConfigurator.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.jetbrains.python.facet;
import com.intellij.ide.highlighter.ArchiveFileType;
@@ -31,7 +31,7 @@ public final class FacetLibraryConfigurator {
@Nullable final ModifiableRootModel existingModel,
final String libraryName,
final List<String> paths) {
final ModifiableModelsProvider modelsProvider = ModifiableModelsProvider.SERVICE.getInstance();
final ModifiableModelsProvider modelsProvider = ModifiableModelsProvider.getInstance();
ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override
public void run() {
@@ -99,7 +99,7 @@ public final class FacetLibraryConfigurator {
}
public static void detachPythonLibrary(final Module module, final String libraryName) {
final ModifiableModelsProvider modelsProvider = ModifiableModelsProvider.SERVICE.getInstance();
final ModifiableModelsProvider modelsProvider = ModifiableModelsProvider.getInstance();
ApplicationManager.getApplication().runWriteAction(() -> {
// remove the library
final ModifiableRootModel model = modelsProvider.getModuleModifiableModel(module);