Skip to content

Commit 420e6f8

Browse files
xwintopxwintop
committed
1、添加默认分组过滤；2、优化自动监听转换操作。
1 parent 8996d3a commit 420e6f8

6 files changed

Lines changed: 64 additions & 45 deletions

File tree

‎src/main/java/com/xwintop/xJavaFxTool/controller/codeTools/EscapeCharacterController.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.net.URL;
44
import java.util.ResourceBundle;
55

6+
import com.xwintop.xJavaFxTool.utils.JavaFxViewUtil;
67
import org.apache.commons.lang.StringEscapeUtils;
78

89
import com.xwintop.xJavaFxTool.view.codeTools.EscapeCharacterView;
@@ -82,12 +83,12 @@ public void changed(ObservableValue<? extends String> observable, String oldValu
8283
}
8384
}
8485
});
85-
// unescapeTextArea.textProperty().addListener((observable, oldValue, newValue) -> {
86-
// switchAction(null);
87-
// });
88-
// escapeTextArea.textProperty().addListener((observable, oldValue, newValue) -> {
89-
// restoreAction(null);
90-
// });
86+
JavaFxViewUtil.setPropertyAddChangeListener(unescapeTextArea, () -> {
87+
switchAction(null);
88+
});
89+
JavaFxViewUtil.setPropertyAddChangeListener(escapeTextArea, () -> {
90+
restoreAction(null);
91+
});
9192
}
9293

9394
@FXML // 转换字符

‎src/main/java/com/xwintop/xJavaFxTool/controller/littleTools/EncryptAndDecryptController.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import cn.hutool.crypto.symmetric.DES;
66
import com.alibaba.druid.filter.config.ConfigTools;
77
import com.xwintop.xJavaFxTool.utils.GuiUtils;
8+
import com.xwintop.xJavaFxTool.utils.JavaFxViewUtil;
89
import com.xwintop.xJavaFxTool.utils.MorseConventer;
910
import com.xwintop.xJavaFxTool.view.littleTools.EncryptAndDecryptView;
1011
import javafx.event.ActionEvent;
@@ -75,12 +76,12 @@ private void initView() {
7576
}
7677

7778
private void initEvent() {
78-
// encrptyTextArea.textProperty().addListener((observable, oldValue, newValue) -> {
79-
// encrptyAction(null);
80-
// });
81-
// decrptyTextArea.textProperty().addListener((observable, oldValue, newValue) -> {
82-
// decrptyAction(null);
83-
// });
79+
JavaFxViewUtil.setPropertyAddChangeListener(encrptyTextArea, () -> {
80+
encrptyAction(null);
81+
});
82+
JavaFxViewUtil.setPropertyAddChangeListener(decrptyTextArea, () -> {
83+
decrptyAction(null);
84+
});
8485
}
8586

8687
@FXML

‎src/main/java/com/xwintop/xJavaFxTool/controller/littleTools/TimeToolController.java‎

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,21 @@
11
package com.xwintop.xJavaFxTool.controller.littleTools;
22

3-
import java.awt.Toolkit;
4-
import java.awt.datatransfer.StringSelection;
5-
import java.net.URL;
6-
import java.text.SimpleDateFormat;
7-
import java.util.Date;
8-
import java.util.ResourceBundle;
9-
import java.util.TimeZone;
10-
11-
import com.jfoenix.controls.JFXComboBox;
123
import com.xwintop.xJavaFxTool.services.littleTools.TimeToolService;
4+
import com.xwintop.xJavaFxTool.utils.JavaFxViewUtil;
135
import com.xwintop.xJavaFxTool.view.littleTools.TimeToolView;
14-
import com.xwintop.xcore.util.javafx.TooltipUtil;
15-
166
import javafx.event.ActionEvent;
177
import javafx.fxml.FXML;
18-
import javafx.fxml.Initializable;
19-
import javafx.scene.control.Button;
20-
import javafx.scene.control.ChoiceBox;
21-
import javafx.scene.control.TextArea;
22-
import javafx.scene.control.TextField;
238
import lombok.Getter;
249
import lombok.Setter;
2510
import lombok.extern.log4j.Log4j;
26-
import org.apache.commons.lang3.time.DateUtils;
11+
12+
import java.awt.*;
13+
import java.awt.datatransfer.StringSelection;
14+
import java.net.URL;
15+
import java.text.SimpleDateFormat;
16+
import java.util.Date;
17+
import java.util.ResourceBundle;
18+
import java.util.TimeZone;
2719

2820
/**
2921
* @ClassName: TimeToolController
@@ -67,12 +59,12 @@ private void initEvent() {
6759
}
6860

6961
private void initService() {
70-
// textFileldTimeStr.textProperty().addListener((observable, oldValue, newValue) -> {
71-
// convert(null);
72-
// });
73-
// textFileldTimeStr2.textProperty().addListener((observable, oldValue, newValue) -> {
74-
// revert(null);
75-
// });
62+
JavaFxViewUtil.setPropertyAddChangeListener(textFileldTimeStr, () -> {
63+
convert(null);
64+
});
65+
JavaFxViewUtil.setPropertyAddChangeListener(textFileldTimeStr2, () -> {
66+
revert(null);
67+
});
7668
}
7769

7870
@FXML

‎src/main/java/com/xwintop/xJavaFxTool/controller/littleTools/ZHConverterController.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.xwintop.xJavaFxTool.controller.littleTools;
22

33
import com.xwintop.xJavaFxTool.services.littleTools.ZHConverterService;
4+
import com.xwintop.xJavaFxTool.utils.JavaFxViewUtil;
45
import com.xwintop.xJavaFxTool.view.littleTools.ZHConverterView;
56
import javafx.event.ActionEvent;
67
import javafx.fxml.FXML;
@@ -34,12 +35,12 @@ private void initView() {
3435
}
3536

3637
private void initEvent() {
37-
// simplifiedTextArea.textProperty().addListener((observable, oldValue, newValue) -> {
38-
// changeAction(null);
39-
// });
40-
// traditionalTextArea.textProperty().addListener((observable, oldValue, newValue) -> {
41-
// restoreAction(null);
42-
// });
38+
JavaFxViewUtil.setPropertyAddChangeListener(simplifiedTextArea, () -> {
39+
changeAction(null);
40+
});
41+
JavaFxViewUtil.setPropertyAddChangeListener(traditionalTextArea, () -> {
42+
restoreAction(null);
43+
});
4344
}
4445

4546
private void initService() {

‎src/main/java/com/xwintop/xJavaFxTool/utils/JavaFxViewUtil.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.xwintop.xJavaFxTool.utils;
22

3+
import cn.hutool.cache.impl.TimedCache;
4+
import cn.hutool.core.lang.Singleton;
35
import com.jfoenix.controls.JFXDecorator;
46
import javafx.collections.ObservableList;
57
import javafx.event.Event;
@@ -356,4 +358,24 @@ protected void updateItem(String item, boolean empty) {
356358
});
357359
}
358360

361+
/**
362+
* 设置改变事件监听操作
363+
*/
364+
public static void setPropertyAddChangeListener(TextInputControl inputControl,Runnable runnable){
365+
inputControl.textProperty().addListener((observable, oldValue, newValue) -> {
366+
setPropertyChangeRun(runnable);
367+
});
368+
}
369+
/**
370+
* 设置改变事件监听防重复操作
371+
*/
372+
public static void setPropertyChangeRun(Runnable runnable) {
373+
if (Singleton.get(TimedCache.class, (long) 2000).get("initiativeChange") != null) {
374+
return;
375+
}
376+
Singleton.get(TimedCache.class, (long) 2000).put("initiativeChange", true);
377+
runnable.run();
378+
Singleton.get(TimedCache.class, (long) 2000).remove("initiativeChange");
379+
}
380+
359381
}

‎src/main/java/com/xwintop/xTransfer/filter/service/impl/FilterBackupImpl.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,12 @@ public class FilterBackupImpl implements Filter {
4242
public void doFilter(IContext ctx, Map params) throws Exception {
4343
for (IMessage iMessage : ctx.getMessages()) {
4444
if (StringUtils.isNotBlank(filterConfigBackup.getFileNameFilterRegex())) {
45+
String fileNameFilterRegexGroup = filterConfigBackup.getFileNameFilterRegexGroup();
46+
if (StringUtils.isEmpty(fileNameFilterRegexGroup)) {
47+
fileNameFilterRegexGroup = "defaultRegexGroup";
48+
}
4549
if ("?!".equals(filterConfigBackup.getFileNameFilterRegex())) {
46-
if (iMessage.checkFileNameFilterRegexGroup(filterConfigBackup.getFileNameFilterRegexGroup())) {
50+
if (iMessage.checkFileNameFilterRegexGroup(fileNameFilterRegexGroup)) {
4751
log.info("Filter:" + filterConfigBackup.getId() + "跳过fileName：" + iMessage.getFileName());
4852
continue;
4953
}
@@ -52,9 +56,7 @@ public void doFilter(IContext ctx, Map params) throws Exception {
5256
log.info("Filter:" + filterConfigBackup.getId() + "跳过fileName：" + iMessage.getFileName());
5357
continue;
5458
}
55-
if (StringUtils.isNotBlank(filterConfigBackup.getFileNameFilterRegexGroup())) {
56-
iMessage.addFileNameFilterRegexGroup(filterConfigBackup.getFileNameFilterRegexGroup());
57-
}
59+
iMessage.addFileNameFilterRegexGroup(fileNameFilterRegexGroup);
5860
}
5961
}
6062
doFilter(iMessage, params);

0 commit comments

Comments
 (0)