MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

use product name

Browse Source 
#WEB-15766 fixed
This commit is contained in:
Dennis Ushakov
2015-03-18 13:59:07 +03:00
parent 2635d49456
commit 61085af49c
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-resources-en/src/messages/VcsBundle.properties
+3
View File
@@ -229,6 +229,9 @@ update.directories.scope.name=Directories
update.project.scope.name=Project
dialog.title.changes.browser=Changes Browser
code.smells.error.messages.tab.name=Code Analysis
code.smells.error.indexing=Code analysis is not possible right now
code.smells.error.indexing.message=Code analysis can''t be performed while {0} updates the indices in background.\n\
You can commit the changes without running inspections, or you can wait until indices are built.
searching.for.code.smells.processing.file.progress.text=Processing {0}
checking.code.smells.progress.title=Performing Code Analysis
before.commit.files.contain.code.smells.edit.them.confirm.text=Some files contain problems.\n\
platform/vcs-impl/src/com/intellij/openapi/vcs/checkin/CodeAnalysisBeforeCheckinHandler.java
+6 -4
View File
@@ -19,6 +19,7 @@ package com.intellij.openapi.vcs.checkin;
import com.intellij.CommonBundle;
import com.intellij.codeInsight.CodeSmellInfo;
import com.intellij.lang.annotation.HighlightSeverity;
import com.intellij.openapi.application.ApplicationNamesInfo;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.project.DumbService;
@@ -32,11 +33,13 @@ import com.intellij.openapi.vcs.changes.CommitExecutor;
import com.intellij.openapi.vcs.ui.RefreshableOnComponent;
import com.intellij.ui.NonFocusableCheckBox;
import com.intellij.util.PairConsumer;
import com.intellij.util.PlatformUtils;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import java.text.MessageFormat;
import java.util.List;
/**
@@ -126,10 +129,9 @@ public class CodeAnalysisBeforeCheckinHandler extends CheckinHandler {
public ReturnResult beforeCheckin(CommitExecutor executor, PairConsumer<Object, Object> additionalDataConsumer) {
if (getSettings().CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT) {
if (DumbService.getInstance(myProject).isDumb()) {
if (Messages.showOkCancelDialog(myProject,
"Code analysis can't be performed while IntelliJ IDEA updates the indices in background.\n" +
"You can commit the changes without running inspections, or you can wait until indices are built.",
"Code analysis is not possible right now",
if (Messages.showOkCancelDialog(myProject, VcsBundle.message("code.smells.error.indexing.message",
ApplicationNamesInfo.getInstance().getProductName()),
VcsBundle.message("code.smells.error.indexing"),
"&Wait", "&Commit", null) == Messages.OK) {
return ReturnResult.CANCEL;
}