Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugin/src/main/java/git4idea/GitUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -1019,7 +1019,7 @@ public static void showPathsInDialog(
) {
DialogBuilder builder = new DialogBuilder(project);
builder.setCenterPanel(new GitSimplePathsBrowser(project, absolutePaths));
if (description != LocalizeValue.empty()) {
if (description.isNotEmpty()) {
builder.setNorthPanel(new MultiLineLabel(description.get()));
}
builder.addOkAction();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public boolean notifyErrorWithRollbackProposal(
AtomicBoolean ok = new AtomicBoolean();
UIUtil.invokeAndWaitIfNeeded((Runnable) () -> {
StringBuilder description = new StringBuilder();
if (message != LocalizeValue.empty()) {
if (message.isNotEmpty()) {
description.append(message).append("<br/>");
}
description.append(rollbackProposal);
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/java/git4idea/commands/GitHandlerUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ public static void runInCurrentThread(
() -> {
if (indicator != null) {
indicator.setTextValue(
operationName == LocalizeValue.empty()
operationName.isEmpty()
? GitLocalize.gitRunning(handler.printableCommandLine())
: operationName
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public JComponent getPreferredFocusedComponent() {
@RequiredUIAccess
protected void doOKAction() {
LocalizeValue error = validateRemoteUnderModal(getRemoteName(), getRemoteUrl());
if (error != LocalizeValue.empty()) {
if (error.isNotEmpty()) {
Messages.showErrorDialog(myRepository.getProject(), error.get(), "Invalid Remote");
}
else {
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/java/git4idea/update/GitFetcher.java
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ public boolean fetchRootsAndNotify(
LOG.info("fetching " + repository);
GitFetchResult result = fetch(repository);
LocalizeValue ai = result.getAdditionalInfo();
if (ai != LocalizeValue.empty()) {
if (ai.isNotEmpty()) {
additionalInfo.put(repository.getRoot(), ai.get());
}
if (!result.isSuccess()) {
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/java/git4idea/util/GitUIUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public static void notifyGitErrors(
Collection<VcsException> gitErrors
) {
StringBuilder content = new StringBuilder();
if (description != LocalizeValue.empty()) {
if (description.isNotEmpty()) {
content.append(description);
}
if (!gitErrors.isEmpty()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public static void notifyUntrackedFilesOverwrittenBy(
NotificationService.getInstance().newError(VcsNotifier.IMPORTANT_ERROR_NOTIFICATION)
.title(LocalizeValue.localizeTODO(operation.capitalize() + " failed"))
.content(
description == LocalizeValue.empty()
description.isEmpty()
? createUntrackedFilesOverwrittenDescription(operation, true)
: description
)
Expand Down
Loading