mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
Fix @NotNull assertion in GitVcsPanel in tests
This commit is contained in:
@@ -16,12 +16,12 @@
|
||||
package git4idea.config;
|
||||
|
||||
import com.intellij.openapi.application.ApplicationNamesInfo;
|
||||
import com.intellij.openapi.components.ServiceManager;
|
||||
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.ui.Messages;
|
||||
import com.intellij.openapi.ui.TextFieldWithBrowseButton;
|
||||
import com.intellij.ui.components.JBCheckBox;
|
||||
import git4idea.GitUtil;
|
||||
import git4idea.GitVcs;
|
||||
import git4idea.i18n.GitBundle;
|
||||
import git4idea.repo.GitRepositoryManager;
|
||||
@@ -76,7 +76,7 @@ public class GitVcsPanel {
|
||||
myConvertTextFilesComboBox.setSelectedItem(CRLF_ASK);
|
||||
myGitField.addBrowseFolderListener(GitBundle.getString("find.git.title"), GitBundle.getString("find.git.description"), project,
|
||||
FileChooserDescriptorFactory.createSingleFileNoJarsDescriptor());
|
||||
final GitRepositoryManager repositoryManager = GitUtil.getRepositoryManager(myProject);
|
||||
final GitRepositoryManager repositoryManager = ServiceManager.getService(myProject, GitRepositoryManager.class);
|
||||
mySyncBranchControl.setVisible(repositoryManager != null && repositoryManager.moreThanOneRoot());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user