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

[file-history] move status text inside comments pane

Browse Source
This commit is contained in:
Julia Beliaeva
2016-07-20 19:19:29 +03:00
parent f1fa7db481
commit d4c8dc223d
1 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
+17 -20
View File
@@ -99,7 +99,6 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton impleme
private static final String VCS_HISTORY_ACTIONS_GROUP = "VcsHistoryActionsGroup";
@NotNull private final Project myProject;
private final MyCommentsPane myComments;
private final StatusText myCommentsStatus;
private final DefaultActionGroup myPopupActions;
private final AbstractVcs myVcs;
private final VcsHistoryProvider myProvider;
@@ -162,21 +161,7 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton impleme
myDiffHandler = customDiffHandler == null ? new StandardDiffFromHistoryHandler() : customDiffHandler;
final DualViewColumnInfo[] columns = createColumnList(myVcs.getProject(), provider, session);
myCommentsStatus = new StatusText() {
@Override
protected boolean isStatusVisible() {
return myComments.isEmpty();
}
};
myCommentsStatus.setText("Commit message");
myComments = new MyCommentsPane() {
@Override
protected void paintComponent(Graphics g) {
super.paintComponent(g);
myCommentsStatus.paint(this, g);
}
};
myCommentsStatus.attachTo(myComments);
myComments = new MyCommentsPane();
myRevisionsOrder = new HashMap<>();
refreshRevisionsOrder();
@@ -1682,12 +1667,28 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton impleme
}
private class MyCommentsPane extends HtmlPanel implements DataProvider, CopyProvider {
@NotNull private final StatusText myStatusText;
@NotNull private String myText = "";
public MyCommentsPane() {
myStatusText = new StatusText() {
@Override
protected boolean isStatusVisible() {
return StringUtil.isEmpty(myText);
}
};
myStatusText.setText("Commit message");
myStatusText.attachTo(this);
setPreferredSize(new Dimension(150, 100));
}
@Override
protected void paintComponent(Graphics g) {
super.paintComponent(g);
myStatusText.paint(this, g);
}
public void update(@NotNull List<TreeNodeOnVcsRevision> selection) {
if (selection.isEmpty()) {
setText("");
@@ -1722,10 +1723,6 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton impleme
}
}
public boolean isEmpty() {
return StringUtil.isEmpty(myText);
}
@Override
public Color getBackground() {
return UIUtil.getEditorPaneBackground();