Skip to content

Commit 0924421

Browse files
fix: 修复MIXING模式下选中问题
1 parent 1c4a2a7 commit 0924421

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

src/main/java/com/fulinlin/ui/commit/CommitPanel.java

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
import javax.swing.*;
1515
import java.awt.*;
16+
import java.util.Iterator;
1617
import java.util.List;
1718
import java.util.Objects;
1819

@@ -152,11 +153,20 @@ private void settingHidden(CommitTemplate commitMessageTemplate) {
152153
changeType.addActionListener(e -> {
153154
if (changeType.getSelectedItem() != null) {
154155
String typeTitle = ((TypeAlias) Objects.requireNonNull(changeType.getSelectedItem())).getTitle();
155-
buttonGroup.getElements().asIterator().forEachRemaining(radioButton -> {
156-
if (radioButton.getActionCommand().equals(typeTitle)) {
157-
radioButton.setSelected(true);
156+
Iterator<AbstractButton> iterator = buttonGroup.getElements().asIterator();
157+
boolean flag = false;
158+
while (iterator.hasNext()) {
159+
AbstractButton radioButton = iterator.next();
160+
boolean equals = radioButton.getActionCommand().equals(typeTitle);
161+
radioButton.setSelected(equals);
162+
if (equals) {
163+
flag = true;
164+
break;
158165
}
159-
});
166+
}
167+
if (!flag) {
168+
buttonGroup.clearSelection();
169+
}
160170
}
161171
});
162172
for (TypeAlias type : typeAliases) {

0 commit comments

Comments
 (0)