Skip to content

Localizing and refactoring (part 4) #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VISTALL merged 4 commits into from
Nov 21, 2025
Merged

Localizing and refactoring (part 4) #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de8e02a
Localizing and refactoring (part 4).
unv-unv Nov 20, 2025
d4b9e0b
GitPushTagMode.equals() formatting.
unv-unv Nov 20, 2025
bac8232
Localizing GitDefineRemoteDialog. Introducing Slf4j logs.
unv-unv Nov 20, 2025
29ffe86
GitDefineRemoteDialog localization update.
unv-unv Nov 21, 2025
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
4 changes: 4 additions & 0 deletions plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,5 +109,9 @@
<artifactId>commons-codec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions plugin/src/main/java/git4idea/actions/GitAbstractRebaseAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import git4idea.rebase.GitRebaseActionDialog;
import git4idea.rebase.GitRebaseUtils;
import git4idea.repo.GitRepository;

import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;

Expand Down Expand Up @@ -102,7 +101,8 @@ private GitRepository chooseRepository(@Nonnull Project project, @Nonnull Collec
return firstRepo;
}
List<VirtualFile> roots = new ArrayList<>(getRootsFromRepositories(repositories));
GitRebaseActionDialog dialog = new GitRebaseActionDialog(project, getTemplatePresentation().getText(), roots, firstRepo.getRoot());
GitRebaseActionDialog dialog =
new GitRebaseActionDialog(project, getTemplatePresentation().getTextValue(), roots, firstRepo.getRoot());
dialog.show();
VirtualFile root = dialog.selectRoot();
if (root == null) {
Expand Down
139 changes: 68 additions & 71 deletions plugin/src/main/java/git4idea/crlf/GitCrlfDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package git4idea.crlf;

import consulo.localize.LocalizeValue;
import consulo.project.Project;
import consulo.ui.ex.awt.*;
import consulo.webBrowser.BrowserUtil;
Expand All @@ -36,75 +37,71 @@
* @see GitCrlfProblemsDetector
*/
public class GitCrlfDialog extends DialogWrapper {

public static final int SET = DialogWrapper.OK_EXIT_CODE;
public static final int DONT_SET = DialogWrapper.NEXT_USER_EXIT_CODE;
public static final int CANCEL = DialogWrapper.CANCEL_EXIT_CODE;
private JBCheckBox myDontWarn;

public GitCrlfDialog(@Nullable Project project) {
super(project, false);

setOKButtonText("Fix and Commit");
setCancelButtonText("Cancel");
setTitle("Line Separators Warning");
getCancelAction().putValue(DialogWrapper.FOCUSED_ACTION, true);

init();
}

@Nonnull
@Override
protected Action[] createActions() {
return new Action[] { getHelpAction(), getOKAction(), getCancelAction(), new DialogWrapperExitAction("Commit As Is", DONT_SET) };
}

@Override
protected JComponent createCenterPanel() {
JLabel description = new JBLabel(
"<html>You are about to commit CRLF line separators to the Git repository.<br/>" +
"It is recommended to set core.autocrlf Git attribute to <code>" + RECOMMENDED_VALUE +
"</code> to avoid line separator issues.</html>");

JLabel additionalDescription = new JBLabel(
"<html>Fix and Commit: <code>git config --global core.autocrlf " + RECOMMENDED_VALUE + "</code> will be called,<br/>" +
"Commit as Is: the config value won't be set.</html>", UIUtil.ComponentStyle.SMALL);

JLabel readMore = new LinkLabel("Read more", null, new LinkListener() {
@Override
public void linkSelected(LinkLabel aSource, Object aLinkData) {
BrowserUtil.browse("https://help.github.com/articles/dealing-with-line-endings");
}
});

JLabel icon = new JBLabel(UIUtil.getWarningIcon(), SwingConstants.LEFT);
myDontWarn = new JBCheckBox("Don't warn again");
myDontWarn.setMnemonic('w');

JPanel rootPanel = new JPanel(new GridBagLayout());
GridBag g = new GridBag()
.setDefaultInsets(new Insets(0, 6, DEFAULT_VGAP, DEFAULT_HGAP))
.setDefaultAnchor(GridBagConstraints.LINE_START)
.setDefaultFill(GridBagConstraints.HORIZONTAL);

rootPanel.add(icon, g.nextLine().next().coverColumn(4));
rootPanel.add(description, g.next());
rootPanel.add(readMore, g.nextLine().next().next());
rootPanel.add(additionalDescription, g.nextLine().next().next().pady(DEFAULT_HGAP));
rootPanel.add(myDontWarn, g.nextLine().next().next().insets(0, 0, 0, 0));

return rootPanel;

}

public boolean dontWarnAgain() {
return myDontWarn.isSelected();
}

@Nullable
@Override
protected String getHelpId() {
return "reference.VersionControl.Git.CrlfWarning";
}

public static final int SET = DialogWrapper.OK_EXIT_CODE;
public static final int DONT_SET = DialogWrapper.NEXT_USER_EXIT_CODE;
public static final int CANCEL = DialogWrapper.CANCEL_EXIT_CODE;
private JBCheckBox myDontWarn;

public GitCrlfDialog(@Nullable Project project) {
super(project, false);

setOKButtonText(LocalizeValue.localizeTODO("Fix and Commit"));
setCancelButtonText(LocalizeValue.localizeTODO("Cancel"));
setTitle(LocalizeValue.localizeTODO("Line Separators Warning"));
getCancelAction().putValue(DialogWrapper.FOCUSED_ACTION, true);

init();
}

@Nonnull
@Override
protected Action[] createActions() {
return new Action[]{getHelpAction(), getOKAction(), getCancelAction(), new DialogWrapperExitAction("Commit As Is", DONT_SET)};
}

@Override
protected JComponent createCenterPanel() {
JLabel description = new JBLabel(
"<html>You are about to commit CRLF line separators to the Git repository.<br/>" +
"It is recommended to set core.autocrlf Git attribute to <code>" + RECOMMENDED_VALUE +
"</code> to avoid line separator issues.</html>");

JLabel additionalDescription = new JBLabel(
"<html>Fix and Commit: <code>git config --global core.autocrlf " + RECOMMENDED_VALUE + "</code> will be called,<br/>" +
"Commit as Is: the config value won't be set.</html>", UIUtil.ComponentStyle.SMALL);

JLabel readMore = new LinkLabel<>(
"Read more",
null,
(aSource, aLinkData) -> BrowserUtil.browse("https://help.github.com/articles/dealing-with-line-endings")
);

JLabel icon = new JBLabel(UIUtil.getWarningIcon(), SwingConstants.LEFT);
myDontWarn = new JBCheckBox("Don't warn again");
myDontWarn.setMnemonic('w');

JPanel rootPanel = new JPanel(new GridBagLayout());
GridBag g = new GridBag()
.setDefaultInsets(JBUI.insets(0, 6, DEFAULT_VGAP, DEFAULT_HGAP))
.setDefaultAnchor(GridBagConstraints.LINE_START)
.setDefaultFill(GridBagConstraints.HORIZONTAL);

rootPanel.add(icon, g.nextLine().next().coverColumn(4));
rootPanel.add(description, g.next());
rootPanel.add(readMore, g.nextLine().next().next());
rootPanel.add(additionalDescription, g.nextLine().next().next().pady(DEFAULT_HGAP));
rootPanel.add(myDontWarn, g.nextLine().next().next().insets(0, 0, 0, 0));

return rootPanel;
}

public boolean dontWarnAgain() {
return myDontWarn.isSelected();
}

@Nullable
@Override
protected String getHelpId() {
return "reference.VersionControl.Git.CrlfWarning";
}
}
Loading
Loading