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

Cleanup and capitalize dialog titles

Browse Source
This commit is contained in:
Kirill Likhodedov
2017-07-03 20:26:49 +03:00
parent 64d65111e7
commit e1cf696029
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/actions/GitInit.java
+4 -8
View File
@@ -40,13 +40,10 @@ import git4idea.commands.GitCommandResult;
import git4idea.i18n.GitBundle;
import org.jetbrains.annotations.NotNull;
/**
* Initialize git repository action
*/
public class GitInit extends DumbAwareAction {
@Override
public void actionPerformed(final AnActionEvent e) {
public void actionPerformed(@NotNull AnActionEvent e) {
Project project = e.getData(CommonDataKeys.PROJECT);
if (project == null) {
project = ProjectManager.getInstance().getDefaultProject();
@@ -63,7 +60,7 @@ public class GitInit extends DumbAwareAction {
doInit(project, fcd, baseDir);
}
private static void doInit(final Project project, FileChooserDescriptor fcd, VirtualFile baseDir) {
private static void doInit(@NotNull Project project, @NotNull FileChooserDescriptor fcd, VirtualFile baseDir) {
FileChooser.chooseFile(fcd, project, baseDir, root -> {
if (GitUtil.isUnderGit(root) && Messages.showYesNoDialog(project,
GitBundle.message("init.warning.already.under.git",
@@ -77,7 +74,7 @@ public class GitInit extends DumbAwareAction {
if (!result.success()) {
GitVcs vcs = GitVcs.getInstance(project);
if (vcs != null && vcs.getExecutableValidator().checkExecutableAndNotifyIfNeeded()) {
VcsNotifier.getInstance(project).notifyError("Git init failed", result.getErrorOutputAsHtmlString());
VcsNotifier.getInstance(project).notifyError("Git Init Failed", result.getErrorOutputAsHtmlString());
}
return;
}
@@ -94,12 +91,11 @@ public class GitInit extends DumbAwareAction {
});
}
public static void refreshAndConfigureVcsMappings(final Project project, final VirtualFile root, final String path) {
public static void refreshAndConfigureVcsMappings(@NotNull Project project, @NotNull VirtualFile root, @NotNull String path) {
VfsUtil.markDirtyAndRefresh(false, true, false, root);
ProjectLevelVcsManager manager = ProjectLevelVcsManager.getInstance(project);
manager.setDirectoryMappings(VcsUtil.addMapping(manager.getDirectoryMappings(), path, GitVcs.NAME));
manager.updateActiveVcss();
VcsDirtyScopeManager.getInstance(project).dirDirtyRecursively(root);
}
}
plugins/git4idea/src/git4idea/i18n/GitBundle.properties
+2 -2
View File
@@ -56,7 +56,7 @@ common.do.not.show=&Do not show this dialog again
common.git.root.tooltip=Select Git VCS root
common.git.root=Git &Root:
common.no.active.branch=<no active branch>
common.refreshing=Refreshing files
common.refreshing=Refreshing Files
computing.annotation=Computing annotation for {0}
crlf.convert.convert=Convert Selected
crlf.convert.label=<html>&The following text files have line separator that do not match the project line separator.<br/>Select files you wish to convert to project default line separators before commit.</html>
@@ -142,7 +142,7 @@ index.file.error=Updating file in the index failed
init.add.root.message=Do you want to add this directory as a VCS root?
init.add.root.title=Git Init
init.destination.directory.description=Select directory where the new Git repository will be created.
init.destination.directory.title=Select directory for git init
init.destination.directory.title=Create Git Repository
init.warning.already.under.git=<html>The selected directory <tt>{0}</tt> is already under Git.<br/>Are you sure that you want to create a new VCS root?</html>
init.warning.title=Git Init
initializing.title=Initializing repository...