diff --git a/plugin/src/main/java/consulo/git/action/ContextMenuGroup.java b/plugin/src/main/java/consulo/git/action/ContextMenuGroup.java index 76b123d..f71aa0a 100644 --- a/plugin/src/main/java/consulo/git/action/ContextMenuGroup.java +++ b/plugin/src/main/java/consulo/git/action/ContextMenuGroup.java @@ -22,7 +22,7 @@ ) public class ContextMenuGroup extends GitMenu { public ContextMenuGroup() { - getTemplatePresentation().setTextValue(GitLocalize.groupContextMenuText()); + getTemplatePresentation().setText(GitLocalize.groupContextMenuText()); setPopup(true); } } diff --git a/plugin/src/main/java/consulo/git/action/VcsMenuGroup.java b/plugin/src/main/java/consulo/git/action/VcsMenuGroup.java index 35ef507..5e06c77 100644 --- a/plugin/src/main/java/consulo/git/action/VcsMenuGroup.java +++ b/plugin/src/main/java/consulo/git/action/VcsMenuGroup.java @@ -28,7 +28,7 @@ ) public class VcsMenuGroup extends GitMenu { public VcsMenuGroup() { - getTemplatePresentation().setTextValue(GitLocalize.groupVcsMenuText()); + getTemplatePresentation().setText(GitLocalize.groupVcsMenuText()); setPopup(true); } } diff --git a/plugin/src/main/java/git4idea/actions/GitCheckoutRevisionAction.java b/plugin/src/main/java/git4idea/actions/GitCheckoutRevisionAction.java index 3707ac1..10806fd 100644 --- a/plugin/src/main/java/git4idea/actions/GitCheckoutRevisionAction.java +++ b/plugin/src/main/java/git4idea/actions/GitCheckoutRevisionAction.java @@ -27,7 +27,7 @@ @ActionImpl(id = "Git.CheckoutRevision") public class GitCheckoutRevisionAction extends GitLogSingleCommitAction { public GitCheckoutRevisionAction() { - getTemplatePresentation().setTextValue(GitLocalize.actionCheckoutRevisionText()); + getTemplatePresentation().setText(GitLocalize.actionCheckoutRevisionText()); } @Override diff --git a/plugin/src/main/java/git4idea/actions/GitCompareWithBranchAction.java b/plugin/src/main/java/git4idea/actions/GitCompareWithBranchAction.java index be73317..2a43171 100644 --- a/plugin/src/main/java/git4idea/actions/GitCompareWithBranchAction.java +++ b/plugin/src/main/java/git4idea/actions/GitCompareWithBranchAction.java @@ -17,7 +17,6 @@ import consulo.annotation.component.ActionImpl; import consulo.git.localize.GitLocalize; -import consulo.localize.LocalizeValue; import consulo.project.Project; import consulo.versionControlSystem.FilePath; import consulo.versionControlSystem.VcsException; @@ -43,7 +42,7 @@ @ActionImpl(id = "Git.CompareWithBranch") public class GitCompareWithBranchAction extends DvcsCompareWithBranchAction { public GitCompareWithBranchAction() { - getTemplatePresentation().setTextValue(GitLocalize.actionCompareWithBranchText()); + getTemplatePresentation().setText(GitLocalize.actionCompareWithBranchText()); } @Override diff --git a/plugin/src/main/java/git4idea/actions/GitCreateNewBranchAction.java b/plugin/src/main/java/git4idea/actions/GitCreateNewBranchAction.java index 215a393..8c1b8d1 100644 --- a/plugin/src/main/java/git4idea/actions/GitCreateNewBranchAction.java +++ b/plugin/src/main/java/git4idea/actions/GitCreateNewBranchAction.java @@ -15,8 +15,6 @@ */ package git4idea.actions; -import java.util.Collections; - import consulo.annotation.component.ActionImpl; import consulo.git.localize.GitLocalize; import consulo.project.Project; @@ -27,11 +25,13 @@ import git4idea.repo.GitRepository; import jakarta.annotation.Nonnull; +import java.util.Collections; + @ActionImpl(id = "Git.CreateNewBranch") public class GitCreateNewBranchAction extends GitLogSingleCommitAction { public GitCreateNewBranchAction() { - getTemplatePresentation().setTextValue(GitLocalize.actionCreateNewBranchText()); - getTemplatePresentation().setDescriptionValue(GitLocalize.actionCreateNewBranchDescription()); + getTemplatePresentation().setText(GitLocalize.actionCreateNewBranchText()); + getTemplatePresentation().setDescription(GitLocalize.actionCreateNewBranchDescription()); } @Override diff --git a/plugin/src/main/java/git4idea/actions/GitCreateTagAction.java b/plugin/src/main/java/git4idea/actions/GitCreateTagAction.java index 3205bb8..f39ba7b 100644 --- a/plugin/src/main/java/git4idea/actions/GitCreateTagAction.java +++ b/plugin/src/main/java/git4idea/actions/GitCreateTagAction.java @@ -18,16 +18,16 @@ import consulo.annotation.component.ActionImpl; import consulo.git.localize.GitLocalize; import consulo.ui.annotation.RequiredUIAccess; -import jakarta.annotation.Nonnull; import consulo.versionControlSystem.log.Hash; import git4idea.history.wholeTree.GitCreateNewTag; import git4idea.repo.GitRepository; +import jakarta.annotation.Nonnull; @ActionImpl(id = "Git.CreateNewTag") public class GitCreateTagAction extends GitLogSingleCommitAction { public GitCreateTagAction() { - getTemplatePresentation().setTextValue(GitLocalize.actionCreateNewTagText()); - getTemplatePresentation().setDescriptionValue(GitLocalize.actionCreateNewTagDescription()); + getTemplatePresentation().setText(GitLocalize.actionCreateNewTagText()); + getTemplatePresentation().setDescription(GitLocalize.actionCreateNewTagDescription()); } @Override diff --git a/plugin/src/main/java/git4idea/actions/GitFileActionGroup.java b/plugin/src/main/java/git4idea/actions/GitFileActionGroup.java index 37c02ba..c95a5bf 100644 --- a/plugin/src/main/java/git4idea/actions/GitFileActionGroup.java +++ b/plugin/src/main/java/git4idea/actions/GitFileActionGroup.java @@ -5,14 +5,13 @@ import consulo.application.dumb.DumbAware; import consulo.codeEditor.Editor; import consulo.git.action.FileActionsGroup; -import consulo.ui.ex.action.DefaultActionGroup; -import consulo.virtualFileSystem.VirtualFile; -import consulo.util.collection.JBIterable; import consulo.git.localize.GitLocalize; import consulo.ui.annotation.RequiredUIAccess; import consulo.ui.ex.action.AnActionEvent; +import consulo.ui.ex.action.DefaultActionGroup; import consulo.ui.ex.action.Presentation; - +import consulo.util.collection.JBIterable; +import consulo.virtualFileSystem.VirtualFile; import jakarta.annotation.Nonnull; import java.util.Arrays; @@ -42,10 +41,10 @@ public void update(@Nonnull AnActionEvent e) { if (e.getData(Editor.KEY) == null && !selection.isEmpty()) { if (selection.get(0).isDirectory()) { - presentation.setTextValue(GitLocalize.actionSelectedDirectoryText(selection.size())); + presentation.setText(GitLocalize.actionSelectedDirectoryText(selection.size())); } else { - presentation.setTextValue(GitLocalize.actionSelectedFileText(selection.size())); + presentation.setText(GitLocalize.actionSelectedFileText(selection.size())); } } } diff --git a/plugin/src/main/java/git4idea/annotate/GitAnnotationProvider.java b/plugin/src/main/java/git4idea/annotate/GitAnnotationProvider.java index 94266b5..7129673 100644 --- a/plugin/src/main/java/git4idea/annotate/GitAnnotationProvider.java +++ b/plugin/src/main/java/git4idea/annotate/GitAnnotationProvider.java @@ -110,7 +110,7 @@ public FileAnnotation annotate(@Nonnull final VirtualFile file, final VcsFileRev final FilePath currentFilePath = VcsUtil.getFilePath(file.getPath()); final FilePath realFilePath; if (progress != null) { - progress.setTextValue(GitLocalize.gettingHistory(file.getName())); + progress.setText(GitLocalize.gettingHistory(file.getName())); } final List revisions = GitHistoryUtils.history(myProject, currentFilePath); if (revision == null) { @@ -120,7 +120,7 @@ public FileAnnotation annotate(@Nonnull final VirtualFile file, final VcsFileRev realFilePath = ((GitFileRevision)revision).getPath(); } if (progress != null) { - progress.setTextValue(GitLocalize.computingAnnotation(file.getName())); + progress.setText(GitLocalize.computingAnnotation(file.getName())); } final GitFileAnnotation result = annotate(realFilePath, revision, revisions, file); annotation[0] = result; diff --git a/plugin/src/main/java/git4idea/commands/GitHandlerUtil.java b/plugin/src/main/java/git4idea/commands/GitHandlerUtil.java index 435c386..1efc3a5 100644 --- a/plugin/src/main/java/git4idea/commands/GitHandlerUtil.java +++ b/plugin/src/main/java/git4idea/commands/GitHandlerUtil.java @@ -174,12 +174,12 @@ public static void runInCurrentThread( handler, () -> { if (indicator != null) { - indicator.setTextValue( + indicator.setText( operationName.isEmpty() ? GitLocalize.gitRunning(handler.printableCommandLine()) : operationName ); - indicator.setText2Value(LocalizeValue.empty()); + indicator.setText2(LocalizeValue.empty()); if (setIndeterminateFlag) { indicator.setIndeterminate(true); } diff --git a/plugin/src/main/java/git4idea/commands/GitTask.java b/plugin/src/main/java/git4idea/commands/GitTask.java index 858e9c9..8fec17b 100644 --- a/plugin/src/main/java/git4idea/commands/GitTask.java +++ b/plugin/src/main/java/git4idea/commands/GitTask.java @@ -313,9 +313,9 @@ public final void runAlone() { @RequiredUIAccess private void justRun() { LocalizeValue oldTitle = myProgressIndicator.getTextValue(); - myProgressIndicator.setTextValue(myTitle); + myProgressIndicator.setText(myTitle); myDelegate.run(myProgressIndicator); - myProgressIndicator.setTextValue(oldTitle); + myProgressIndicator.setText(oldTitle); if (myProgressIndicator.isCanceled()) { onCancel(); } diff --git a/plugin/src/main/java/git4idea/reset/GitResetAction.java b/plugin/src/main/java/git4idea/reset/GitResetAction.java index aa663ec..66913bd 100644 --- a/plugin/src/main/java/git4idea/reset/GitResetAction.java +++ b/plugin/src/main/java/git4idea/reset/GitResetAction.java @@ -35,7 +35,7 @@ @ActionImpl(id = "Git.Reset.In.Log") public class GitResetAction extends GitOneCommitPerRepoLogAction { public GitResetAction() { - getTemplatePresentation().setTextValue(GitLocalize.actionLogResetText()); + getTemplatePresentation().setText(GitLocalize.actionLogResetText()); } @Override diff --git a/plugin/src/main/java/git4idea/stash/GitShelveChangesSaver.java b/plugin/src/main/java/git4idea/stash/GitShelveChangesSaver.java index b806db1..ab6cc1d 100644 --- a/plugin/src/main/java/git4idea/stash/GitShelveChangesSaver.java +++ b/plugin/src/main/java/git4idea/stash/GitShelveChangesSaver.java @@ -58,7 +58,7 @@ protected void save(@Nonnull Collection rootsToSave) throws VcsExce new LocalChangesUnderRoots(myChangeManager, myVcsManager).getChangesByLists(rootsToSave); LocalizeValue oldProgressTitle = myProgressIndicator.getTextValue(); - myProgressIndicator.setTextValue(GitLocalize.updateShelvingChanges()); + myProgressIndicator.setText(GitLocalize.updateShelvingChanges()); List exceptions = new ArrayList<>(1); myShelvedLists = new HashMap<>(); @@ -91,7 +91,7 @@ protected void save(@Nonnull Collection rootsToSave) throws VcsExce GitRollbackEnvironment.resetHardLocal(myProject, root); } } - myProgressIndicator.setTextValue(oldProgressTitle); + myProgressIndicator.setText(oldProgressTitle); } @Override @@ -100,7 +100,7 @@ public void load() { if (myShelvedLists != null) { LOG.info("load "); LocalizeValue oldProgressTitle = myProgressIndicator.getTextValue(); - myProgressIndicator.setTextValue(GitLocalize.updateUnshelvingChanges()); + myProgressIndicator.setText(GitLocalize.updateUnshelvingChanges()); for (ShelvedChangeList list : myShelvedLists.values()) { GitShelveUtils.doSystemUnshelve( myProject, @@ -110,7 +110,7 @@ public void load() { getConflictRightPanelTitle() ); } - myProgressIndicator.setTextValue(oldProgressTitle); + myProgressIndicator.setText(oldProgressTitle); } } diff --git a/plugin/src/main/java/git4idea/stash/GitStashChangesSaver.java b/plugin/src/main/java/git4idea/stash/GitStashChangesSaver.java index ae5d71a..d22dd69 100644 --- a/plugin/src/main/java/git4idea/stash/GitStashChangesSaver.java +++ b/plugin/src/main/java/git4idea/stash/GitStashChangesSaver.java @@ -94,7 +94,7 @@ protected void save(@Nonnull Collection rootsToSave) throws VcsExce } } } - myProgressIndicator.setTextValue(oldProgressTitle); + myProgressIndicator.setText(oldProgressTitle); } } diff --git a/plugin/src/main/java/git4idea/ui/branch/GitBranchPopupActions.java b/plugin/src/main/java/git4idea/ui/branch/GitBranchPopupActions.java index 12fed98..b01f75d 100644 --- a/plugin/src/main/java/git4idea/ui/branch/GitBranchPopupActions.java +++ b/plugin/src/main/java/git4idea/ui/branch/GitBranchPopupActions.java @@ -173,7 +173,7 @@ public void update(@Nonnull AnActionEvent e) { boolean isFresh = ContainerUtil.and(myRepositories, Repository::isFresh); if (isFresh) { e.getPresentation().setEnabled(false); - e.getPresentation().setDescriptionValue(GitBranchesLocalize.actionCheckoutTagOrRevisionImpossibleDescription()); + e.getPresentation().setDescription(GitBranchesLocalize.actionCheckoutTagOrRevisionImpossibleDescription()); } } } @@ -210,7 +210,7 @@ protected AbstractBranchActions( myGitBranchManager = project.getInstance(GitBranchManager.class); getTemplatePresentation().setDisabledMnemonic(true); - getTemplatePresentation().setTextValue(LocalizeValue.of(branchName)); + getTemplatePresentation().setText(LocalizeValue.of(branchName)); } protected class CompareAction extends DumbAwareAction { diff --git a/plugin/src/main/java/git4idea/update/GitMergeUpdater.java b/plugin/src/main/java/git4idea/update/GitMergeUpdater.java index 65c20bc..78cce1c 100644 --- a/plugin/src/main/java/git4idea/update/GitMergeUpdater.java +++ b/plugin/src/main/java/git4idea/update/GitMergeUpdater.java @@ -87,7 +87,7 @@ protected GitUpdateResult doUpdate() { new GitUntrackedFilesOverwrittenByOperationDetector(myRoot); LocalizeValue originalText = myProgressIndicator.getTextValue(); - myProgressIndicator.setTextValue(LocalizeValue.localizeTODO("Merging" + GitUtil.mention(myRepository) + "...")); + myProgressIndicator.setText(LocalizeValue.localizeTODO("Merging" + GitUtil.mention(myRepository) + "...")); try { GitCommandResult result = myGit.merge( myRepository, @@ -97,7 +97,7 @@ protected GitUpdateResult doUpdate() { untrackedFilesDetector, GitStandardProgressAnalyzer.createListener(myProgressIndicator) ); - myProgressIndicator.setTextValue(originalText); + myProgressIndicator.setText(originalText); return result.success() ? GitUpdateResult.SUCCESS : handleMergeFailure(mergeLineListener, untrackedFilesDetector, merger, result.getErrorOutputAsJoinedValue()); diff --git a/plugin/src/main/java/git4idea/update/GitUpdateProcess.java b/plugin/src/main/java/git4idea/update/GitUpdateProcess.java index 4386e06..42800c8 100644 --- a/plugin/src/main/java/git4idea/update/GitUpdateProcess.java +++ b/plugin/src/main/java/git4idea/update/GitUpdateProcess.java @@ -124,7 +124,7 @@ public GitUpdateProcess( public GitUpdateResult update(UpdateMethod updateMethod) { LOG.info("update started|" + updateMethod); LocalizeValue oldText = myProgressIndicator.getTextValue(); - myProgressIndicator.setTextValue(LocalizeValue.localizeTODO("Updating...")); + myProgressIndicator.setText(LocalizeValue.localizeTODO("Updating...")); for (GitRepository repository : myRepositories) { repository.update(); @@ -146,7 +146,7 @@ public GitUpdateResult update(UpdateMethod updateMethod) { try (AccessToken ignored = DvcsUtil.workingTreeChangeStarted(myProject, "VCS Update")) { result = updateImpl(updateMethod); } - myProgressIndicator.setTextValue(oldText); + myProgressIndicator.setText(oldText); return result; }