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

Use common commit message editing component during rebase

Browse Source
This commit is contained in:
Konstantin Kolosovsky
2017-06-25 15:40:48 +03:00
parent 8934b00d85
commit 52924622b5
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java
+2 -6
View File
@@ -135,7 +135,7 @@ public class CommitMessage extends JPanel implements Disposable, DataProvider, C
/**
* Creates a text editor appropriate for creating commit messages.
* @return a commit message editor
* @deprecated Use {@link CommitMessage#createCommitMessageEditor(Project, boolean)}.
* @deprecated Use {@link CommitMessage} component.
*/
@Deprecated
public static EditorTextField createCommitTextEditor(@NotNull Project project, @SuppressWarnings("unused") boolean forceSpellCheckOn) {
@@ -143,11 +143,7 @@ public class CommitMessage extends JPanel implements Disposable, DataProvider, C
}
@NotNull
public static EditorTextField createCommitMessageEditor(@NotNull Project project) {
return createCommitMessageEditor(project, true);
}
public static EditorTextField createCommitMessageEditor(@NotNull Project project, boolean runInspections) {
private static EditorTextField createCommitMessageEditor(@NotNull Project project, boolean runInspections) {
Set<EditorCustomization> features = newHashSet();
VcsConfiguration configuration = VcsConfiguration.getInstance(project);
plugins/git4idea/src/git4idea/rebase/GitRebaseUnstructuredEditor.java
+6 -7
View File
@@ -19,7 +19,6 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.vcs.ui.CommitMessage;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.ui.EditorTextField;
import com.intellij.ui.components.JBLabel;
import com.intellij.util.ui.JBUI;
import com.intellij.util.ui.UIUtil;
@@ -35,7 +34,7 @@ import javax.swing.*;
*/
class GitRebaseUnstructuredEditor extends DialogWrapper {
@NotNull private final JBLabel myRootLabel;
@NotNull private final EditorTextField myTextEditor;
@NotNull private final CommitMessage myTextEditor;
GitRebaseUnstructuredEditor(@NotNull Project project, @NotNull VirtualFile root, @NotNull String initialText) {
super(project, true);
@@ -44,9 +43,9 @@ class GitRebaseUnstructuredEditor extends DialogWrapper {
myRootLabel = new JBLabel("Git Root: " + root.getPresentableUrl());
myTextEditor = CommitMessage.createCommitMessageEditor(project);
myTextEditor = new CommitMessage(project, false, false, true);
myTextEditor.setText(initialText);
myTextEditor.setCaretPosition(0);
myTextEditor.getEditorField().setCaretPosition(0);
init();
}
@@ -54,7 +53,7 @@ class GitRebaseUnstructuredEditor extends DialogWrapper {
protected JComponent createCenterPanel() {
BorderLayoutPanel rootPanel = JBUI.Panels.simplePanel(UIUtil.DEFAULT_HGAP, UIUtil.DEFAULT_VGAP);
rootPanel.addToTop(myRootLabel);
rootPanel.addToCenter(myTextEditor.getComponent());
rootPanel.addToCenter(myTextEditor);
return rootPanel;
}
@@ -65,11 +64,11 @@ class GitRebaseUnstructuredEditor extends DialogWrapper {
@Override
public JComponent getPreferredFocusedComponent() {
return myTextEditor.getFocusTarget();
return myTextEditor.getEditorField().getFocusTarget();
}
@NotNull
String getText() {
return myTextEditor.getText();
return myTextEditor.getComment();
}
}