From fb0bfa2bff01fd982d10bf26cbdbdae3564d09ee Mon Sep 17 00:00:00 2001 From: Hammy Date: Tue, 10 Aug 2021 00:01:57 +0100 Subject: [PATCH] Remove empty constructor --- src/main/java/me/goudham/ClipboardUtils.java | 9 +++++---- src/main/java/me/goudham/MacClipboardListener.java | 1 + .../goudham/{ => domain}/GenericClipboardContent.java | 10 +++------- src/test/java/me/goudham/ClipboardUtilsTest.java | 1 + 4 files changed, 10 insertions(+), 11 deletions(-) rename src/main/java/me/goudham/{ => domain}/GenericClipboardContent.java (82%) diff --git a/src/main/java/me/goudham/ClipboardUtils.java b/src/main/java/me/goudham/ClipboardUtils.java index f540d30..7d0be1c 100644 --- a/src/main/java/me/goudham/ClipboardUtils.java +++ b/src/main/java/me/goudham/ClipboardUtils.java @@ -9,6 +9,7 @@ import java.io.File; import java.io.IOException; import java.util.List; import me.goudham.domain.ClipboardContent; +import me.goudham.domain.GenericClipboardContent; import me.goudham.domain.MyBufferedImage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -88,16 +89,16 @@ class ClipboardUtils { * @return {@link GenericClipboardContent} containing clipboard contents */ GenericClipboardContent getClipboardContents(Transferable contents) { - GenericClipboardContent genericClipboardContent = new GenericClipboardContent<>(); + GenericClipboardContent genericClipboardContent = null; try { if (contents.isDataFlavorSupported(TEXT.getDataFlavor())) { - genericClipboardContent.setOldContent(contents.getTransferData(TEXT.getDataFlavor())); + genericClipboardContent = new GenericClipboardContent<>(contents.getTransferData(TEXT.getDataFlavor())); } else if (contents.isDataFlavorSupported(IMAGE.getDataFlavor())) { BufferedImage bufferedImage = convertToBufferedImage((Image) contents.getTransferData(IMAGE.getDataFlavor())); - genericClipboardContent.setOldContent(new MyBufferedImage(bufferedImage)); + genericClipboardContent = new GenericClipboardContent<>(new MyBufferedImage(bufferedImage)); } else if (contents.isDataFlavorSupported(FILE.getDataFlavor())) { - genericClipboardContent.setOldContent(contents.getTransferData(FILE.getDataFlavor())); + genericClipboardContent = new GenericClipboardContent<>(contents.getTransferData(FILE.getDataFlavor())); } } catch (UnsupportedFlavorException | IOException exp) { logger.error("Exception Thrown When Retrieving Clipboard Contents", exp); diff --git a/src/main/java/me/goudham/MacClipboardListener.java b/src/main/java/me/goudham/MacClipboardListener.java index 9ca1169..802ec63 100644 --- a/src/main/java/me/goudham/MacClipboardListener.java +++ b/src/main/java/me/goudham/MacClipboardListener.java @@ -9,6 +9,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import me.goudham.domain.ClipboardContent; +import me.goudham.domain.GenericClipboardContent; import me.goudham.domain.MyBufferedImage; import static java.lang.Thread.sleep; diff --git a/src/main/java/me/goudham/GenericClipboardContent.java b/src/main/java/me/goudham/domain/GenericClipboardContent.java similarity index 82% rename from src/main/java/me/goudham/GenericClipboardContent.java rename to src/main/java/me/goudham/domain/GenericClipboardContent.java index d4bc26b..2e28a6b 100644 --- a/src/main/java/me/goudham/GenericClipboardContent.java +++ b/src/main/java/me/goudham/domain/GenericClipboardContent.java @@ -1,15 +1,11 @@ -package me.goudham; +package me.goudham.domain; import java.util.Objects; -class GenericClipboardContent { +public class GenericClipboardContent { private T oldContent; - GenericClipboardContent() { - - } - - GenericClipboardContent(Object oldContent) { + public GenericClipboardContent(Object oldContent) { this.oldContent = (T) oldContent; } diff --git a/src/test/java/me/goudham/ClipboardUtilsTest.java b/src/test/java/me/goudham/ClipboardUtilsTest.java index 72978a3..20c7442 100644 --- a/src/test/java/me/goudham/ClipboardUtilsTest.java +++ b/src/test/java/me/goudham/ClipboardUtilsTest.java @@ -10,6 +10,7 @@ import java.io.IOException; import java.util.List; import java.util.stream.Stream; import me.goudham.domain.ClipboardContent; +import me.goudham.domain.GenericClipboardContent; import me.goudham.domain.MyBufferedImage; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test;