Skip to content
This repository was archived by the owner on Mar 6, 2024. It is now read-only.

Commit 60023b7

Browse files
committed
refactor: optimize code
1 parent de1bd02 commit 60023b7

File tree

3 files changed

+32
-9
lines changed

3 files changed

+32
-9
lines changed

src/main/java/org/code4everything/wetool/WeApplication.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ public static void main(String[] args) {
142142
private static void addShutdownHook() {
143143
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
144144
EventCenter.publishEvent(EventCenter.EVENT_WETOOL_EXIT, DateUtil.date());
145+
log.info("close druid data source connections");
145146
DruidSource.listAllDataSources().forEach(DruidDataSource::close);
146147

147148
WeUtils.getThreadPoolExecutor().shutdown();
@@ -163,7 +164,7 @@ private static void addShutdownHook() {
163164
log.error(ExceptionUtil.stacktraceToString(e, Integer.MAX_VALUE));
164165
}
165166
}
166-
log.info("wetool exited");
167+
log.info("wetool exit");
167168
}));
168169
}
169170

@@ -223,7 +224,7 @@ private static void initKeyboardMouseListener() {
223224
log.info("jnative keyboard mouse listener disabled");
224225
if (!SystemUtil.getOsInfo().isMac()) {
225226
// 已知Mac平台下不能正常工作
226-
EventCenter.subscribeEvent(EventCenter.EVENT_100_MS_TIMER, new MouseLocationListenerEventHandler());
227+
EventCenter.on100MsTimer(new MouseLocationListenerEventHandler());
227228
}
228229
return;
229230
}

src/main/java/org/code4everything/wetool/controller/ClipboardHistoryController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ private void initialize() {
4444
insert(pair.getKey(), pair.getValue());
4545
}
4646

47-
EventCenter.subscribeEvent(EventCenter.EVENT_CLIPBOARD_CHANGED, new BaseClipboardChangedEventHandler() {
47+
EventCenter.onClipboardChanged(new BaseClipboardChangedEventHandler() {
4848
@Override
4949
public void handleEvent0(String s, Date date, ClipboardChangedEventMessage message) {
5050
Platform.runLater(() -> insert(date, message.getClipboardText()));

src/main/java/org/code4everything/wetool/controller/MainController.java

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
import cn.hutool.core.io.FileUtil;
88
import cn.hutool.core.lang.Pair;
99
import cn.hutool.core.swing.clipboard.ClipboardUtil;
10-
import cn.hutool.core.util.*;
10+
import cn.hutool.core.util.ArrayUtil;
11+
import cn.hutool.core.util.NumberUtil;
12+
import cn.hutool.core.util.ObjectUtil;
13+
import cn.hutool.core.util.RuntimeUtil;
14+
import cn.hutool.core.util.StrUtil;
1115
import cn.hutool.extra.pinyin.PinyinUtil;
1216
import cn.hutool.system.SystemUtil;
1317
import com.google.common.base.Preconditions;
@@ -16,7 +20,18 @@
1620
import javafx.event.EventHandler;
1721
import javafx.fxml.FXML;
1822
import javafx.scene.Node;
19-
import javafx.scene.control.*;
23+
import javafx.scene.control.ComboBox;
24+
import javafx.scene.control.Control;
25+
import javafx.scene.control.Menu;
26+
import javafx.scene.control.MenuItem;
27+
import javafx.scene.control.ScrollPane;
28+
import javafx.scene.control.SeparatorMenuItem;
29+
import javafx.scene.control.SplitPane;
30+
import javafx.scene.control.Tab;
31+
import javafx.scene.control.TabPane;
32+
import javafx.scene.control.TextArea;
33+
import javafx.scene.control.TextField;
34+
import javafx.scene.control.TitledPane;
2035
import javafx.scene.input.KeyCode;
2136
import javafx.scene.input.KeyEvent;
2237
import javafx.scene.layout.HBox;
@@ -58,7 +73,14 @@
5873
import org.jnativehook.keyboard.NativeKeyEvent;
5974

6075
import java.io.File;
61-
import java.util.*;
76+
import java.util.ArrayList;
77+
import java.util.Date;
78+
import java.util.HashMap;
79+
import java.util.LinkedHashMap;
80+
import java.util.List;
81+
import java.util.Map;
82+
import java.util.Objects;
83+
import java.util.Set;
6284
import java.util.concurrent.ConcurrentHashMap;
6385
import java.util.regex.Pattern;
6486

@@ -179,15 +201,15 @@ private void initialize() {
179201
addWebTool();
180202
// 监听剪贴板
181203
config.appendClipboardHistory(new Date(), ClipboardUtil.getStr());
182-
EventCenter.subscribeEvent(EventCenter.EVENT_SECONDS_TIMER, new BaseNoMessageEventHandler() {
204+
EventCenter.onSecondTimer(new BaseNoMessageEventHandler() {
183205
@Override
184206
public void handleEvent0(String s, Date date) {
185207
watchClipboard(date);
186208
}
187209
});
188210

189211
// 监听鼠标位置
190-
EventCenter.subscribeEvent(EventCenter.EVENT_MOUSE_MOTION, new MouseMotionEventHandler());
212+
EventCenter.onMouseMotion(new MouseMotionEventHandler());
191213
multiDesktopOnWindows();
192214

193215
registerActions();
@@ -474,7 +496,7 @@ private void multiDesktopOnWindows() {
474496
return;
475497
}
476498

477-
EventCenter.subscribeEvent(EventCenter.EVENT_MOUSE_CORNER_TRIGGER, new BaseMouseCornerEventHandler() {
499+
EventCenter.onSysCornerTrigger(new BaseMouseCornerEventHandler() {
478500
@Override
479501
public void handleEvent0(String s, Date date, MouseCornerEventMessage message) {
480502
if (config.getWinVirtualDesktopHotCorner() == message.getType()) {

0 commit comments

Comments
 (0)