diff --git a/src/main/java/org/jetbrains/plugins/github/GithubCreatePullRequestAction.java b/src/main/java/org/jetbrains/plugins/github/GithubCreatePullRequestAction.java index 596759b..8a8fee7 100644 --- a/src/main/java/org/jetbrains/plugins/github/GithubCreatePullRequestAction.java +++ b/src/main/java/org/jetbrains/plugins/github/GithubCreatePullRequestAction.java @@ -183,7 +183,7 @@ static void createPullRequest(@Nonnull final Project project, @Nullable VirtualF @Override public void run(@Nonnull ProgressIndicator indicator) { LOG.info("Pushing current branch"); - indicator.setTextValue(LocalizeValue.localizeTODO("Pushing current branch...")); + indicator.setText(LocalizeValue.localizeTODO("Pushing current branch...")); GitCommandResult result = git.push(repository, remoteName, remoteUrl, puttyKey, currentBranch.getName(), true); if (!result.success()) { GithubNotifications.showError( @@ -209,7 +209,7 @@ public void run(@Nonnull ProgressIndicator indicator) { } LOG.info("Creating pull request"); - indicator.setTextValue(LocalizeValue.localizeTODO("Creating pull request...")); + indicator.setText(LocalizeValue.localizeTODO("Creating pull request...")); GithubPullRequest request = createPullRequest(project, auth, targetRepo, dialog.getRequestTitle(), dialog.getDescription(), from, onto); if (request == null) { diff --git a/src/main/java/org/jetbrains/plugins/github/GithubRebaseAction.java b/src/main/java/org/jetbrains/plugins/github/GithubRebaseAction.java index 15e2960..9939e34 100644 --- a/src/main/java/org/jetbrains/plugins/github/GithubRebaseAction.java +++ b/src/main/java/org/jetbrains/plugins/github/GithubRebaseAction.java @@ -131,7 +131,7 @@ public void run(@Nonnull ProgressIndicator indicator) { if (upstreamRemoteUrl == null) { LOG.info("Configuring upstream remote"); - indicator.setTextValue(LocalizeValue.localizeTODO("Configuring upstream remote...")); + indicator.setText(LocalizeValue.localizeTODO("Configuring upstream remote...")); upstreamRemoteUrl = configureUpstreamRemote(project, root, gitRepository, indicator); if (upstreamRemoteUrl == null) { return; @@ -160,13 +160,13 @@ public void run(@Nonnull ProgressIndicator indicator) { } LOG.info("Fetching upstream"); - indicator.setTextValue(LocalizeValue.localizeTODO("Fetching upstream...")); + indicator.setText(LocalizeValue.localizeTODO("Fetching upstream...")); if (!fetchParent(project, gitRepository, indicator)) { return; } LOG.info("Rebasing current branch"); - indicator.setTextValue(LocalizeValue.localizeTODO("Rebasing current branch...")); + indicator.setText(LocalizeValue.localizeTODO("Rebasing current branch...")); rebaseCurrentBranch(project, root, gitRepository, indicator); } }.queue(); @@ -200,7 +200,7 @@ static String configureUpstreamRemote( String parentRepoUrl = GithubUrlUtil.getGitHost() + '/' + repositoryInfo.getParent().getFullName() + ".git"; LOG.info("Adding GitHub parent as a remote host"); - indicator.setTextValue(LocalizeValue.localizeTODO("Adding GitHub parent as a remote host...")); + indicator.setText(LocalizeValue.localizeTODO("Adding GitHub parent as a remote host...")); return addParentAsUpstreamRemote(project, root, parentRepoUrl, gitRepository); } diff --git a/src/main/java/org/jetbrains/plugins/github/GithubShareAction.java b/src/main/java/org/jetbrains/plugins/github/GithubShareAction.java index 9a1db51..e29abf5 100644 --- a/src/main/java/org/jetbrains/plugins/github/GithubShareAction.java +++ b/src/main/java/org/jetbrains/plugins/github/GithubShareAction.java @@ -174,7 +174,7 @@ public static void shareProjectOnGithub(@Nonnull final Project project, @Nullabl public void run(@Nonnull ProgressIndicator indicator) { // create GitHub repo (network) LOG.info("Creating GitHub repository"); - indicator.setTextValue(LocalizeValue.localizeTODO("Creating GitHub repository...")); + indicator.setText(LocalizeValue.localizeTODO("Creating GitHub repository...")); String url = createGithubRepository( project, githubInfo.getAuthData(), @@ -191,7 +191,7 @@ public void run(@Nonnull ProgressIndicator indicator) { LOG.info("Binding local project with GitHub"); if (!gitDetected) { LOG.info("No git detected, creating empty git repo"); - indicator.setTextValue(LocalizeValue.localizeTODO("Creating empty git repo...")); + indicator.setText(LocalizeValue.localizeTODO("Creating empty git repo...")); if (!createEmptyGitRepository(project, root, indicator)) { return; } @@ -206,7 +206,7 @@ public void run(@Nonnull ProgressIndicator indicator) { //git remote add origin git@github.com:login/name.git LOG.info("Adding GitHub as a remote host"); - indicator.setTextValue(LocalizeValue.localizeTODO("Adding GitHub as a remote host...")); + indicator.setText(LocalizeValue.localizeTODO("Adding GitHub as a remote host...")); if (!addGithubRemote(project, root, remoteName, remoteUrl, repository)) { return; } @@ -218,7 +218,7 @@ public void run(@Nonnull ProgressIndicator indicator) { //git push origin master LOG.info("Pushing to github master"); - indicator.setTextValue(LocalizeValue.localizeTODO("Pushing to github master...")); + indicator.setText(LocalizeValue.localizeTODO("Pushing to github master...")); if (!pushCurrentBranch(project, repository, remoteName, remoteUrl, name, url)) { return; } @@ -344,7 +344,7 @@ private static boolean performFirstCommitIfRequired( LOG.info("Trying to commit"); try { LOG.info("Adding files for commit"); - indicator.setTextValue(LocalizeValue.localizeTODO("Adding files to git...")); + indicator.setText(LocalizeValue.localizeTODO("Adding files to git...")); // ask for files to add List trackedFiles = ChangeListManager.getInstance(project).getAffectedFiles(); @@ -389,7 +389,7 @@ private static boolean performFirstCommitIfRequired( // commit LOG.info("Performing commit"); - indicator.setTextValue(LocalizeValue.localizeTODO("Performing commit...")); + indicator.setText(LocalizeValue.localizeTODO("Performing commit...")); GitSimpleHandler handler = new GitSimpleHandler(project, root, GitCommand.COMMIT); handler.addParameters("-m", dialog.getCommitMessage()); handler.endOptions();