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

[git] UntrackedFilesNotifier: better variable name

Browse Source
This commit is contained in:
Kirill Likhodedov
2012-08-14 16:19:07 +04:00
parent fa37f9bf0b
commit 522b850139
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/branch/GitBranchOperation.java
+1 -1
View File
@@ -350,7 +350,7 @@ abstract class GitBranchOperation {
private void showUntrackedFilesDialogWithRollback(@NotNull Collection<VirtualFile> untrackedFiles) {
String title = "Couldn't " + getOperationName();
String description = UntrackedFilesNotifier.createUntrackedFilesOverwrittenDescription(getOperationName(), true);
String description = UntrackedFilesNotifier.createUntrackedFilesOverwrittenDescription(getOperationName(), false);
final SelectFilesDialog dialog = new UntrackedFilesDialog(myProject, new ArrayList<VirtualFile>(untrackedFiles),
stripHtml(description, true));
plugins/git4idea/src/git4idea/util/UntrackedFilesNotifier.java
+6 -6
View File
@@ -48,14 +48,14 @@ public class UntrackedFilesNotifier {
@NotNull final Collection<VirtualFile> untrackedFiles,
@NotNull final String operation, @Nullable String description) {
final String notificationTitle = StringUtil.capitalize(operation) + " error";
final String notificationDesc = description == null ? createUntrackedFilesOverwrittenDescription(operation, false) : description;
final String dialogDesc = createUntrackedFilesOverwrittenDescription(operation, true);
final String notificationDesc = description == null ? createUntrackedFilesOverwrittenDescription(operation, true) : description;
platformFacade.getNotificator(project).notifyError(notificationTitle, notificationDesc,
new NotificationListener() {
@Override
public void hyperlinkUpdate(@NotNull Notification notification, @NotNull HyperlinkEvent event) {
if (event.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
final String dialogDesc = createUntrackedFilesOverwrittenDescription(operation, false);
SelectFilesDialog dlg = new SelectFilesDialog(project, new ArrayList<VirtualFile>(untrackedFiles),
StringUtil.stripHtml(dialogDesc, true), null, false, false) {
@Override
@@ -70,15 +70,15 @@ public class UntrackedFilesNotifier {
});
}
public static String createUntrackedFilesOverwrittenDescription(@NotNull final String operation, boolean filesAreShown) {
public static String createUntrackedFilesOverwrittenDescription(@NotNull final String operation, boolean addLinkToViewFiles) {
final String description1 = " untracked working tree files would be overwritten by " + operation + ".";
final String description2 = "Please move or remove them before you can " + operation + ".";
final String notificationDesc;
if (filesAreShown) {
notificationDesc = "These" + description1 + "<br/>" + description2;
if (addLinkToViewFiles) {
notificationDesc = "Some" + description1 + "<br/>" + description2 + " <a href='view'>View them</a>";
}
else {
notificationDesc = "Some" + description1 + "<br/>" + description2 + " <a href='view'>View them</a>";
notificationDesc = "These" + description1 + "<br/>" + description2;
}
return notificationDesc;
}
plugins/git4idea/tests/git4idea/branch/GitBranchOperationsTest.java
+1 -1
View File
@@ -230,7 +230,7 @@ public class GitBranchOperationsTest extends AbstractVcsTestCase {
doCheckoutOrMerge(checkout, "feature");
String operation = checkout ? "checkout" : "merge";
assertNotify(NotificationType.ERROR, UntrackedFilesNotifier.createUntrackedFilesOverwrittenDescription(operation, false));
assertNotify(NotificationType.ERROR, UntrackedFilesNotifier.createUntrackedFilesOverwrittenDescription(operation, true));
}
@Test