From d959f3a24f9266e562ceb2ad57eb9a81af58375a Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 22 Sep 2022 03:06:25 +0800 Subject: [PATCH] fix code --- hutool-swing/src/main/java/cn/hutool/swing/RobotUtil.java | 2 +- .../java/cn/hutool/swing/clipboard/ClipboardListener.java | 2 +- .../java/cn/hutool/swing/clipboard/ClipboardMonitor.java | 5 ++++- .../main/java/cn/hutool/swing/clipboard/ClipboardUtil.java | 6 +++--- .../main/java/cn/hutool/swing/clipboard/ImageSelection.java | 2 +- .../cn/hutool/swing/clipboard/StrClipboardListener.java | 2 +- .../src/test/java/cn/hutool/swing/ClipboardMonitorTest.java | 4 ++-- .../src/test/java/cn/hutool/swing/ClipboardUtilTest.java | 5 ++--- .../src/test/java/cn/hutool/swing/RobotUtilTest.java | 1 - 9 files changed, 15 insertions(+), 14 deletions(-) diff --git a/hutool-swing/src/main/java/cn/hutool/swing/RobotUtil.java b/hutool-swing/src/main/java/cn/hutool/swing/RobotUtil.java index 6f89624ee..1c57e4bd6 100755 --- a/hutool-swing/src/main/java/cn/hutool/swing/RobotUtil.java +++ b/hutool-swing/src/main/java/cn/hutool/swing/RobotUtil.java @@ -1,8 +1,8 @@ package cn.hutool.swing; import cn.hutool.core.exceptions.UtilException; +import cn.hutool.swing.clipboard.ClipboardUtil; import cn.hutool.swing.img.ImgUtil; -import cn.hutool.core.swing.clipboard.ClipboardUtil; import java.awt.AWTException; import java.awt.Rectangle; diff --git a/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardListener.java b/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardListener.java index 663b953f2..57d898283 100755 --- a/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardListener.java +++ b/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardListener.java @@ -1,4 +1,4 @@ -package cn.hutool.core.swing.clipboard; +package cn.hutool.swing.clipboard; import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.Transferable; diff --git a/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardMonitor.java b/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardMonitor.java index 5f2788fa9..f4978fe82 100755 --- a/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardMonitor.java +++ b/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardMonitor.java @@ -1,4 +1,4 @@ -package cn.hutool.core.swing.clipboard; +package cn.hutool.swing.clipboard; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.ObjUtil; @@ -17,6 +17,9 @@ import java.util.Set; * @since 4.5.6 */ public enum ClipboardMonitor implements ClipboardOwner, Runnable, Closeable { + /** + * 监听器单例 + */ INSTANCE; /** 默认重试此时:10 */ diff --git a/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardUtil.java b/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardUtil.java index 123b3c56b..2b7108614 100755 --- a/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardUtil.java +++ b/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardUtil.java @@ -1,4 +1,6 @@ -package cn.hutool.core.swing.clipboard; +package cn.hutool.swing.clipboard; + +import cn.hutool.core.exceptions.UtilException; import java.awt.Image; import java.awt.Toolkit; @@ -10,8 +12,6 @@ import java.awt.datatransfer.Transferable; import java.awt.datatransfer.UnsupportedFlavorException; import java.io.IOException; -import cn.hutool.core.exceptions.UtilException; - /** * 系统剪贴板工具类 * diff --git a/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ImageSelection.java b/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ImageSelection.java index 05d58eca3..f3f696e65 100755 --- a/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ImageSelection.java +++ b/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ImageSelection.java @@ -1,4 +1,4 @@ -package cn.hutool.core.swing.clipboard; +package cn.hutool.swing.clipboard; import java.awt.Image; import java.awt.datatransfer.DataFlavor; diff --git a/hutool-swing/src/main/java/cn/hutool/swing/clipboard/StrClipboardListener.java b/hutool-swing/src/main/java/cn/hutool/swing/clipboard/StrClipboardListener.java index efba390e9..7f64dcf9d 100755 --- a/hutool-swing/src/main/java/cn/hutool/swing/clipboard/StrClipboardListener.java +++ b/hutool-swing/src/main/java/cn/hutool/swing/clipboard/StrClipboardListener.java @@ -1,4 +1,4 @@ -package cn.hutool.core.swing.clipboard; +package cn.hutool.swing.clipboard; import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.DataFlavor; diff --git a/hutool-swing/src/test/java/cn/hutool/swing/ClipboardMonitorTest.java b/hutool-swing/src/test/java/cn/hutool/swing/ClipboardMonitorTest.java index de8678cd2..b099ba5bc 100755 --- a/hutool-swing/src/test/java/cn/hutool/swing/ClipboardMonitorTest.java +++ b/hutool-swing/src/test/java/cn/hutool/swing/ClipboardMonitorTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.swing; +package cn.hutool.swing; import cn.hutool.core.lang.Console; -import cn.hutool.core.swing.clipboard.ClipboardUtil; +import cn.hutool.swing.clipboard.ClipboardUtil; import org.junit.Ignore; import org.junit.Test; diff --git a/hutool-swing/src/test/java/cn/hutool/swing/ClipboardUtilTest.java b/hutool-swing/src/test/java/cn/hutool/swing/ClipboardUtilTest.java index c7110fdd7..d3692685a 100755 --- a/hutool-swing/src/test/java/cn/hutool/swing/ClipboardUtilTest.java +++ b/hutool-swing/src/test/java/cn/hutool/swing/ClipboardUtilTest.java @@ -1,10 +1,9 @@ -package cn.hutool.core.swing; +package cn.hutool.swing; +import cn.hutool.swing.clipboard.ClipboardUtil; import org.junit.Assert; import org.junit.Test; -import cn.hutool.core.swing.clipboard.ClipboardUtil; - /** * 剪贴板工具类单元测试 * diff --git a/hutool-swing/src/test/java/cn/hutool/swing/RobotUtilTest.java b/hutool-swing/src/test/java/cn/hutool/swing/RobotUtilTest.java index 553f02d71..00c32e48c 100755 --- a/hutool-swing/src/test/java/cn/hutool/swing/RobotUtilTest.java +++ b/hutool-swing/src/test/java/cn/hutool/swing/RobotUtilTest.java @@ -1,7 +1,6 @@ package cn.hutool.swing; import cn.hutool.core.io.FileUtil; -import cn.hutool.swing.RobotUtil; import org.junit.Ignore; import org.junit.Test;