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

migrate usages of ModalityState.NON_MODAL to ModalityState.nonModal

Browse Source 
GitOrigin-RevId: fb4855bfa90dbf384fed24871e4b28ab803847bb
This commit is contained in:
Daniil Ovchinnikov
2023-06-09 18:40:23 +02:00
committed by intellij-monorepo-bot
parent b6546d9246
commit 97f0a7fd3b
244 changed files with 503 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnCompatibilityChecker.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-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.svn;
import com.intellij.openapi.Disposable;
@@ -70,7 +70,7 @@ final class SvnCompatibilityChecker implements Disposable {
if (isDisposed(this)) return;
new VcsBalloonProblemNotifier(myProject, message, MessageType.WARNING).run();
},
ModalityState.NON_MODAL
ModalityState.nonModal()
);
}

4
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.svn;
import com.intellij.application.Topics;
@@ -134,7 +134,7 @@ public final class SvnVcs extends AbstractVcs {
ApplicationManager.getApplication().invokeLater(() -> {
cleanup17copies();
getSvnConfiguration().setCleanupRun(true);
}, ModalityState.NON_MODAL, myProject.getDisposed());
}, ModalityState.nonModal(), myProject.getDisposed());
}
else {
invokeRefreshSvnRoots();

4
plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShareWholeProject.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-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.svn.actions;
import com.intellij.openapi.actionSystem.*;
@@ -156,7 +156,7 @@ public class ShareWholeProject extends AnAction implements DumbAware {
final ProjectLevelVcsManager vcsManager = ProjectLevelVcsManager.getInstance(project);
vcsManager.setDirectoryMappings(Collections.singletonList(VcsDirectoryMapping.createDefault(SvnVcs.VCS_NAME)));
}
}, ModalityState.NON_MODAL, project.getDisposed()));
}, ModalityState.nonModal(), project.getDisposed()));
}
}
}

6
plugins/svn4idea/src/org/jetbrains/idea/svn/auth/SvnAuthenticationNotifier.kt
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-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.svn.auth
import com.intellij.concurrency.JobScheduler
@@ -149,7 +149,7 @@ class SvnAuthenticationNotifier(project: Project) :
getApplication().invokeLater(
{
outdatedRequests.forEach { removeLazyNotificationByKey(it) }
}, ModalityState.NON_MODAL
}, ModalityState.nonModal()
)
}
@@ -326,7 +326,7 @@ class SvnAuthenticationNotifier(project: Project) :
configuration.configurationDirectory, { configuration.setConfigurationDirParameters(false, it) }, project, null)
}
)
}, ModalityState.NON_MODAL, project.disposed)
}, ModalityState.nonModal(), project.disposed)
@JvmStatic
fun clearAuthenticationCache(project: Project, component: Component?, configDirPath: String?) {

4
plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/SvnCheckinHandlerFactory.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-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.svn.checkin;
import com.intellij.openapi.application.ApplicationManager;
@@ -94,7 +94,7 @@ public class SvnCheckinHandlerFactory extends VcsCheckinHandlerFactory {
ApplicationManager.getApplication().invokeLater(
() -> AutoSvnUpdater
.run(new AutoSvnUpdater(project, paths.toArray(new FilePath[0])), VcsBundle.message("action.name.update")),
ModalityState.NON_MODAL);
ModalityState.nonModal());
}
}
};

6
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopiesPanel.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-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.svn.dialogs;
import com.intellij.configurationStore.StoreUtil;
@@ -130,7 +130,7 @@ public class CopiesPanel extends SimpleToolWindowPanel {
}
}
else {
getApplication().invokeLater(() -> isRefreshing = false, ModalityState.NON_MODAL);
getApplication().invokeLater(() -> isRefreshing = false, ModalityState.nonModal());
}
}
@@ -139,7 +139,7 @@ public class CopiesPanel extends SimpleToolWindowPanel {
boolean hasErrors = !getVcs().getSvnFileUrlMapping().getErrorRoots().isEmpty();
List<WorkingCopyFormat> supportedFormats = getSupportedFormats();
getApplication().invokeLater(() -> setWorkingCopies(infoList, hasErrors, supportedFormats), ModalityState.NON_MODAL);
getApplication().invokeLater(() -> setWorkingCopies(infoList, hasErrors, supportedFormats), ModalityState.nonModal());
}
@RequiresEdt

4
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.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-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.svn.dialogs;
import com.intellij.CommonBundle;
@@ -986,7 +986,7 @@ public class RepositoryBrowserDialog extends DialogWrapper {
@Override
public void actionPerformed(@NotNull AnActionEvent e) {
final RepositoryTreeNode selectedNode = getSelectedNode();
if (!ModalityState.NON_MODAL.equals(ModalityState.current())) {
if (!ModalityState.nonModal().equals(ModalityState.current())) {
doCancelAction();
}
doCheckout(ProjectLevelVcsManager.getInstance(myProject).getCompositeCheckoutListener(), selectedNode);

4
plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnMergeSourceDetails.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.svn.history;
import com.intellij.openapi.application.ModalityState;
@@ -58,7 +58,7 @@ public final class SvnMergeSourceDetails extends MasterDetailsComponent {
}
public static void showMe(final Project project, final SvnFileRevision revision, final VirtualFile file) {
if (ModalityState.NON_MODAL.equals(ModalityState.current())) {
if (ModalityState.nonModal().equals(ModalityState.current())) {
ToolWindow toolWindow = ToolWindowManager.getInstance(project).getToolWindow(ChangesViewContentManager.TOOLWINDOW_ID);
final ContentManager contentManager = toolWindow.getContentManager();