From 3735ad583961282f8f49258d91c6d28170d0e0fa Mon Sep 17 00:00:00 2001 From: Hammy Date: Fri, 13 Aug 2021 14:37:41 +0100 Subject: [PATCH] Rename methods to be more accurate --- src/main/java/me/goudham/ClipboardUtils.java | 6 +++--- src/main/java/me/goudham/MacClipboard.java | 8 ++++---- src/main/java/me/goudham/SystemClipboard.java | 2 +- src/main/java/me/goudham/WindowsOrUnixClipboard.java | 2 +- src/test/java/me/goudham/ClipboardUtilsTest.java | 10 +++++----- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/me/goudham/ClipboardUtils.java b/src/main/java/me/goudham/ClipboardUtils.java index 7d0be1c..8510c9a 100644 --- a/src/main/java/me/goudham/ClipboardUtils.java +++ b/src/main/java/me/goudham/ClipboardUtils.java @@ -88,7 +88,7 @@ class ClipboardUtils { * @param contents The {@link Transferable} which holds the clipboard contents * @return {@link GenericClipboardContent} containing clipboard contents */ - GenericClipboardContent getClipboardContents(Transferable contents) { + GenericClipboardContent getGenericClipboardContents(Transferable contents) { GenericClipboardContent genericClipboardContent = null; try { @@ -113,7 +113,7 @@ class ClipboardUtils { * @param oldContents The given {@link Transferable} which holds the clipboard contents * @return {@link ClipboardContent} containing old clipboard contents */ - ClipboardContent getOldClipboardContent(Transferable oldContents) { + ClipboardContent getClipboardContent(Transferable oldContents) { ClipboardContent clipboardContent = null; try { @@ -137,7 +137,7 @@ class ClipboardUtils { * @param object The given {@link Object} which holds the clipboard contents * @return {@link ClipboardContent} containing old clipboard contents */ - ClipboardContent getOldClipboardContent(Object object) { + ClipboardContent getClipboardContent(Object object) { ClipboardContent clipboardContent = null; if (object instanceof String) { diff --git a/src/main/java/me/goudham/MacClipboard.java b/src/main/java/me/goudham/MacClipboard.java index b1a347d..8faa4cc 100644 --- a/src/main/java/me/goudham/MacClipboard.java +++ b/src/main/java/me/goudham/MacClipboard.java @@ -45,7 +45,7 @@ class MacClipboard extends SystemClipboard implements Runnable { if (isTextMonitored()) { Object oldContent = genericClipboardContents[0].getOldContent(); if (!newStringContent.equals(oldContent)) { - ClipboardContent clipboardContent = clipboardUtils.getOldClipboardContent(oldContent); + ClipboardContent clipboardContent = clipboardUtils.getClipboardContent(oldContent); eventManager.notifyTextEvent(clipboardContent, newStringContent); } } @@ -67,7 +67,7 @@ class MacClipboard extends SystemClipboard implements Runnable { if (isImageMonitored()) { if (!bufferedImageContent.equals(genericClipboardContents[0].getOldContent())) { - ClipboardContent clipboardContent = clipboardUtils.getOldClipboardContent(genericClipboardContents[0].getOldContent()); + ClipboardContent clipboardContent = clipboardUtils.getClipboardContent(genericClipboardContents[0].getOldContent()); eventManager.notifyImageEvent(clipboardContent, bufferedImageContent.getBufferedImage()); } } @@ -90,7 +90,7 @@ class MacClipboard extends SystemClipboard implements Runnable { if (isFileMonitored()) { if (!fileListContent.equals(genericClipboardContents[0].getOldContent())) { - ClipboardContent clipboardContent = clipboardUtils.getOldClipboardContent(genericClipboardContents[0].getOldContent()); + ClipboardContent clipboardContent = clipboardUtils.getClipboardContent(genericClipboardContents[0].getOldContent()); eventManager.notifyFilesEvent(clipboardContent, fileListContent); } } @@ -190,7 +190,7 @@ class MacClipboard extends SystemClipboard implements Runnable { @Override void execute() { Transferable oldClipboardContents = clipboard.getContents(null); - genericClipboardContents = new GenericClipboardContent[] { clipboardUtils.getClipboardContents(oldClipboardContents) }; + genericClipboardContents = new GenericClipboardContent[] { clipboardUtils.getGenericClipboardContents(oldClipboardContents) }; scheduledExecutorService.scheduleAtFixedRate(this, 0, 200, TimeUnit.MILLISECONDS); } } diff --git a/src/main/java/me/goudham/SystemClipboard.java b/src/main/java/me/goudham/SystemClipboard.java index be3204c..01b947e 100644 --- a/src/main/java/me/goudham/SystemClipboard.java +++ b/src/main/java/me/goudham/SystemClipboard.java @@ -118,7 +118,7 @@ abstract class SystemClipboard { */ ClipboardContent getContents() { Transferable clipboardContents = clipboard.getContents(null); - return clipboardContents == null ? null : clipboardUtils.getOldClipboardContent(clipboardContents); + return clipboardContents == null ? null : clipboardUtils.getClipboardContent(clipboardContents); } /** diff --git a/src/main/java/me/goudham/WindowsOrUnixClipboard.java b/src/main/java/me/goudham/WindowsOrUnixClipboard.java index 29c35e1..3c3c4d8 100644 --- a/src/main/java/me/goudham/WindowsOrUnixClipboard.java +++ b/src/main/java/me/goudham/WindowsOrUnixClipboard.java @@ -51,7 +51,7 @@ class WindowsOrUnixClipboard extends SystemClipboard implements Runnable, Clipbo * @param newClipboardContents The new contents of the clipboard */ void processContents(Clipboard oldClipboard, Transferable oldClipboardContents, Transferable newClipboardContents) { - ClipboardContent clipboardContent = clipboardUtils.getOldClipboardContent(oldClipboardContents); + ClipboardContent clipboardContent = clipboardUtils.getClipboardContent(oldClipboardContents); if (isTextMonitored()) { if (TEXT.isAvailable(oldClipboard) && !FILE.isAvailable(oldClipboard)) { diff --git a/src/test/java/me/goudham/ClipboardUtilsTest.java b/src/test/java/me/goudham/ClipboardUtilsTest.java index 7b1accf..d8791b5 100644 --- a/src/test/java/me/goudham/ClipboardUtilsTest.java +++ b/src/test/java/me/goudham/ClipboardUtilsTest.java @@ -130,12 +130,12 @@ class ClipboardUtilsTest { } @ParameterizedTest - @MethodSource("provideArgumentsForRetrievingClipboardContents") + @MethodSource("provideArgumentsForRetrievingGenericClipboardContents") void successfullyRetrieveOldClipboardContents(GenericClipboardContent expectedGenericClipboardContent, Object expectedContent, DataFlavor dataFlavor) throws IOException, UnsupportedFlavorException { when(transferableMock.isDataFlavorSupported(dataFlavor)).thenReturn(true); when(transferableMock.getTransferData(dataFlavor)).thenReturn(expectedContent); - GenericClipboardContent actualGenericClipboardContent = sut.getClipboardContents(transferableMock); + GenericClipboardContent actualGenericClipboardContent = sut.getGenericClipboardContents(transferableMock); assertThat(actualGenericClipboardContent.getOldContent(), is(expectedGenericClipboardContent.getOldContent())); verifyNoInteractions(logger); @@ -147,7 +147,7 @@ class ClipboardUtilsTest { when(transferableMock.isDataFlavorSupported(dataFlavor)).thenReturn(true); when(transferableMock.getTransferData(dataFlavor)).thenReturn(expectedContent); - ClipboardContent actualClipboardContent = sut.getOldClipboardContent(transferableMock); + ClipboardContent actualClipboardContent = sut.getClipboardContent(transferableMock); assertThat(actualClipboardContent.getText(), is(expectedString)); assertThat(actualClipboardContent.getFiles(), is(expectedFiles)); @@ -158,7 +158,7 @@ class ClipboardUtilsTest { @ParameterizedTest @MethodSource("provideArgumentsForOldClipboardContents") void successfullyMarshallClipboardContentsIntoOldClipboardContent(Object expectedOldContent, String expectedString, BufferedImage expectedImage, List expectedFiles) { - ClipboardContent actualClipboardContent = sut.getOldClipboardContent(expectedOldContent); + ClipboardContent actualClipboardContent = sut.getClipboardContent(expectedOldContent); assertThat(actualClipboardContent.getText(), is(expectedString)); assertThat(actualClipboardContent.getImage(), is(expectedImage)); @@ -192,7 +192,7 @@ class ClipboardUtilsTest { } - static Stream provideArgumentsForRetrievingClipboardContents() { + static Stream provideArgumentsForRetrievingGenericClipboardContents() { String string = "testString"; BufferedImage bufferedImage = new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB); MyBufferedImage myBufferedImage = new MyBufferedImage(bufferedImage);