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

[vcs-log] more correctly use prepositions in commit details (specifically: at -> on for dates and add at before time) IDEA-135940

Browse Source
This commit is contained in:
Julia Beliaeva
2015-03-22 20:22:41 +03:00
parent ae29187a33
commit 0dd8844cd5
1 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java
+27 -13
View File
@@ -65,7 +65,10 @@ import javax.swing.text.Position;
import javax.swing.text.html.HTMLEditorKit;
import javax.swing.text.html.parser.ParserDelegator;
import java.awt.*;
import java.io.*;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -324,14 +327,15 @@ class DetailsPanel extends JPanel implements ListSelectionListener {
}
if (myBranches.isEmpty()) return "<i>Not in any branch</i>";
if (myExpanded) {
int rowCount = (int) Math.ceil((double)myBranches.size() / BRANCHES_TABLE_COLUMN_COUNT);
int rowCount = (int)Math.ceil((double)myBranches.size() / BRANCHES_TABLE_COLUMN_COUNT);
HtmlTableBuilder builder = new HtmlTableBuilder();
for (int i = 0; i < rowCount; i++) {
builder.startRow();
if (i == 0) {
builder.append("<i>In " + myBranches.size() + " branches, </i><a href=\"" + SHOW_OR_HIDE_BRANCHES + "\"><i>hide</i></a>: ");
} else {
}
else {
builder.append("");
}
@@ -339,9 +343,11 @@ class DetailsPanel extends JPanel implements ListSelectionListener {
int index = rowCount * j + i;
if (index >= myBranches.size()) {
builder.append("");
} else if (index != myBranches.size() - 1) {
}
else if (index != myBranches.size() - 1) {
builder.append(myBranches.get(index) + "," + StringUtil.repeat("&nbsp;", 20), LEFT_ALIGN);
} else {
}
else {
builder.append(myBranches.get(index), LEFT_ALIGN);
}
}
@@ -401,23 +407,31 @@ class DetailsPanel extends JPanel implements ListSelectionListener {
}
private static String getAuthorText(VcsFullCommitDetails commit) {
String authorText = commit.getAuthor().getName() + " at " + DateFormatUtil.formatDateTime(commit.getAuthorTime());
long authorTime = commit.getAuthorTime();
long commitTime = commit.getCommitTime();
String authorText = commit.getAuthor().getName() + formatDateTime(authorTime);
if (!commit.getAuthor().equals(commit.getCommitter())) {
String commitTime;
if (commit.getAuthorTime() != commit.getCommitTime()) {
commitTime = " at " + DateFormatUtil.formatDateTime(commit.getCommitTime());
String commitTimeText;
if (authorTime != commitTime) {
commitTimeText = formatDateTime(commitTime);
}
else {
commitTime = "";
commitTimeText = "";
}
authorText += " (committed by " + commit.getCommitter().getName() + commitTime + ")";
authorText += " (committed by " + commit.getCommitter().getName() + commitTimeText + ")";
}
else if (commit.getAuthorTime() != commit.getCommitTime()) {
authorText += " (committed at " + DateFormatUtil.formatDateTime(commit.getCommitTime()) + ")";
else if (authorTime != commitTime) {
authorText += " (committed " + formatDateTime(commitTime) + ")";
}
return authorText;
}
@NotNull
private static String formatDateTime(long time) {
return " on " + DateFormatUtil.formatDate(time) + " at " + DateFormatUtil.formatTime(time);
}
@Override
public String getSelectedText() {
Document doc = getDocument();