JCNC/JNotepad
JCNC/JNotepad
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 修复 BUG 新建超过10个默认标签页后，序号错误

Browse Source
This commit is contained in:
gewuyou 2023-10-14 19:03:32 +08:00
parent 694cd2a448
commit 6b5449a6d5
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/jcnc/jnotepad/app/utils/TabUtil.java
View File

@ -250,6 +250,7 @@ public class TabUtil {
// 设定初始索引 // 设定初始索引
int index = 1; int index = 1;
StringBuilder tabTitle = new StringBuilder(); StringBuilder tabTitle = new StringBuilder();
String content = UiResourceBundle.getContent(NEW_FILE);
// 获取当前默认创建标签页集合 // 获取当前默认创建标签页集合
List<Tab> tabs = CenterTabPane.getInstance() List<Tab> tabs = CenterTabPane.getInstance()
.getTabs() .getTabs()
@ -257,15 +258,21 @@ public class TabUtil {
// 排除不属于默认创建的标签页 // 排除不属于默认创建的标签页
.filter(tab -> AppConstants.TABNAME_PATTERN.matcher(tab.getText()).matches()) .filter(tab -> AppConstants.TABNAME_PATTERN.matcher(tab.getText()).matches())
// 对默认创建的标签页进行排序 // 对默认创建的标签页进行排序
.sorted(Comparator.comparing(Tab::getText)) .sorted(Comparator.comparing(tab -> {
String tabText = tab.getText();
// 提取数字部分
String numberPart = tabText.substring(content.length());
// 解析为数字
return Integer.parseInt(numberPart);
}))
// 转为List集合 // 转为List集合
.toList(); .toList();
// 构建初始标签页名称 // 构建初始标签页名称
tabTitle.append(UiResourceBundle.getContent(TextConstants.NEW_FILE)).append(index); tabTitle.append(content).append(index);
for (Tab tab : tabs) { for (Tab tab : tabs) {
if (tab.getText().contentEquals(tabTitle)) { if (tab.getText().contentEquals(tabTitle)) {
tabTitle.setLength(0); tabTitle.setLength(0);
tabTitle.append(UiResourceBundle.getContent(TextConstants.NEW_FILE)).append(++index); tabTitle.append(content).append(++index);
} else { } else {
break; break;
} }