Skip to content

Commit f3d95db

Browse files
authored
Refactoring usage of LocalizeValue.empty(). (#28)
1 parent e203363 commit f3d95db

7 files changed

Lines changed: 7 additions & 7 deletions

File tree

plugin/src/main/java/git4idea/GitUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,7 @@ public static void showPathsInDialog(
10191019
) {
10201020
DialogBuilder builder = new DialogBuilder(project);
10211021
builder.setCenterPanel(new GitSimplePathsBrowser(project, absolutePaths));
1022-
if (description != LocalizeValue.empty()) {
1022+
if (description.isNotEmpty()) {
10231023
builder.setNorthPanel(new MultiLineLabel(description.get()));
10241024
}
10251025
builder.addOkAction();

plugin/src/main/java/git4idea/branch/GitBranchUiHandlerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public boolean notifyErrorWithRollbackProposal(
7272
AtomicBoolean ok = new AtomicBoolean();
7373
UIUtil.invokeAndWaitIfNeeded((Runnable) () -> {
7474
StringBuilder description = new StringBuilder();
75-
if (message != LocalizeValue.empty()) {
75+
if (message.isNotEmpty()) {
7676
description.append(message).append("<br/>");
7777
}
7878
description.append(rollbackProposal);

plugin/src/main/java/git4idea/commands/GitHandlerUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public static void runInCurrentThread(
175175
() -> {
176176
if (indicator != null) {
177177
indicator.setTextValue(
178-
operationName == LocalizeValue.empty()
178+
operationName.isEmpty()
179179
? GitLocalize.gitRunning(handler.printableCommandLine())
180180
: operationName
181181
);

plugin/src/main/java/git4idea/push/GitDefineRemoteDialog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public JComponent getPreferredFocusedComponent() {
9696
@RequiredUIAccess
9797
protected void doOKAction() {
9898
LocalizeValue error = validateRemoteUnderModal(getRemoteName(), getRemoteUrl());
99-
if (error != LocalizeValue.empty()) {
99+
if (error.isNotEmpty()) {
100100
Messages.showErrorDialog(myRepository.getProject(), error.get(), "Invalid Remote");
101101
}
102102
else {

plugin/src/main/java/git4idea/update/GitFetcher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ public boolean fetchRootsAndNotify(
344344
LOG.info("fetching " + repository);
345345
GitFetchResult result = fetch(repository);
346346
LocalizeValue ai = result.getAdditionalInfo();
347-
if (ai != LocalizeValue.empty()) {
347+
if (ai.isNotEmpty()) {
348348
additionalInfo.put(repository.getRoot(), ai.get());
349349
}
350350
if (!result.isSuccess()) {

plugin/src/main/java/git4idea/util/GitUIUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public static void notifyGitErrors(
141141
Collection<VcsException> gitErrors
142142
) {
143143
StringBuilder content = new StringBuilder();
144-
if (description != LocalizeValue.empty()) {
144+
if (description.isNotEmpty()) {
145145
content.append(description);
146146
}
147147
if (!gitErrors.isEmpty()) {

plugin/src/main/java/git4idea/util/GitUntrackedFilesHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public static void notifyUntrackedFilesOverwrittenBy(
7171
NotificationService.getInstance().newError(VcsNotifier.IMPORTANT_ERROR_NOTIFICATION)
7272
.title(LocalizeValue.localizeTODO(operation.capitalize() + " failed"))
7373
.content(
74-
description == LocalizeValue.empty()
74+
description.isEmpty()
7575
? createUntrackedFilesOverwrittenDescription(operation, true)
7676
: description
7777
)

0 commit comments

Comments
 (0)