hammy
/
MyClipboard
mirror of https://github.com/sgoudham/MyClipboard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename enum from 'FILELIST' to 'FILE'

Browse Source
pull/2/head
Hammy 3 years ago
parent a1156a4cef
commit 738e108976
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File

14
src/main/java/me/goudham/ClipboardUtils.java
Unescape Escape View File

@ -12,7 +12,7 @@ import me.goudham.domain.OldClipboardContent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static me.goudham.Contents.FILELIST;
import static me.goudham.Contents.FILE;
import static me.goudham.Contents.IMAGE;
import static me.goudham.Contents.TEXT;
@ -70,8 +70,8 @@ class ClipboardUtils {
List<File> fileList = null;
try {
if (clipboardContents.isDataFlavorSupported(FILELIST.getDataFlavor())) {
fileList = (List<File>) clipboardContents.getTransferData(FILELIST.getDataFlavor());
if (clipboardContents.isDataFlavorSupported(FILE.getDataFlavor())) {
fileList = (List<File>) clipboardContents.getTransferData(FILE.getDataFlavor());
}
} catch (UnsupportedFlavorException | IOException exp) {
logger.error("Exception Thrown When Retrieving File Content", exp);
@ -95,8 +95,8 @@ class ClipboardUtils {
} else if (contents.isDataFlavorSupported(IMAGE.getDataFlavor())) {
BufferedImage bufferedImage = convertToBufferedImage((Image) contents.getTransferData(IMAGE.getDataFlavor()));
myClipboardContent.setOldContent(new MyBufferedImage(bufferedImage));
} else if (contents.isDataFlavorSupported(FILELIST.getDataFlavor())) {
myClipboardContent.setOldContent(contents.getTransferData(FILELIST.getDataFlavor()));
} else if (contents.isDataFlavorSupported(FILE.getDataFlavor())) {
myClipboardContent.setOldContent(contents.getTransferData(FILE.getDataFlavor()));
}
} catch (UnsupportedFlavorException | IOException exp) {
logger.error("Exception Thrown When Retrieving Clipboard Contents", exp);
@ -119,8 +119,8 @@ class ClipboardUtils {
oldClipboardContent = new OldClipboardContent((String) oldContents.getTransferData(TEXT.getDataFlavor()));
} else if (oldContents.isDataFlavorSupported(IMAGE.getDataFlavor())) {
oldClipboardContent = new OldClipboardContent(convertToBufferedImage((Image) oldContents.getTransferData(IMAGE.getDataFlavor())));
} else if (oldContents.isDataFlavorSupported(FILELIST.getDataFlavor())) {
oldClipboardContent = new OldClipboardContent((List<File>) oldContents.getTransferData(FILELIST.getDataFlavor()));
} else if (oldContents.isDataFlavorSupported(FILE.getDataFlavor())) {
oldClipboardContent = new OldClipboardContent((List<File>) oldContents.getTransferData(FILE.getDataFlavor()));
}
} catch (UnsupportedFlavorException | IOException exp) {
logger.error("Exception Thrown When Retrieving Clipboard Contents", exp);

2
src/main/java/me/goudham/Contents.java
Unescape Escape View File

@ -16,7 +16,7 @@ enum Contents {
return clipboard.isDataFlavorAvailable(DataFlavor.imageFlavor);
}
},
FILELIST(DataFlavor.javaFileListFlavor) {
FILE(DataFlavor.javaFileListFlavor) {
@Override
public boolean isAvailable(Clipboard clipboard) {
return clipboard.isDataFlavorAvailable(DataFlavor.javaFileListFlavor);

6
src/main/java/me/goudham/MacClipboardListener.java
Unescape Escape View File

@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit;
import me.goudham.domain.OldClipboardContent;
import static java.lang.Thread.sleep;
import static me.goudham.Contents.FILELIST;
import static me.goudham.Contents.FILE;
import static me.goudham.Contents.IMAGE;
import static me.goudham.Contents.TEXT;
@ -31,7 +31,7 @@ class MacClipboardListener extends ClipboardListener implements Runnable {
* @param myClipboardContents {@link MyClipboardContent[]} of Unknown {@link Class} containing previous contents
*/
void checkText(Transferable newClipboardContents, MyClipboardContent<?>[] myClipboardContents) {
if (TEXT.isAvailable(clipboard) && !FILELIST.isAvailable(clipboard)) {
if (TEXT.isAvailable(clipboard) && !FILE.isAvailable(clipboard)) {
String newStringContent = clipboardUtils.getStringContent(newClipboardContents);
if (newStringContent == null) return;
@ -77,7 +77,7 @@ class MacClipboardListener extends ClipboardListener implements Runnable {
* @param myClipboardContents {@link MyClipboardContent[]} of Unknown {@link Class} containing previous contents
*/
void checkFiles(Transferable newClipboardContents, MyClipboardContent<?>[] myClipboardContents) {
if (FILELIST.isAvailable(clipboard)) {
if (FILE.isAvailable(clipboard)) {
List<File> fileListContent = clipboardUtils.getFileContent(newClipboardContents);
if (fileListContent == null) return;

6
src/main/java/me/goudham/WindowsOrUnixClipboardListener.java
Unescape Escape View File

@ -13,7 +13,7 @@ import me.goudham.domain.OldClipboardContent;
import static java.lang.Thread.currentThread;
import static java.lang.Thread.sleep;
import static me.goudham.Contents.FILELIST;
import static me.goudham.Contents.FILE;
import static me.goudham.Contents.IMAGE;
import static me.goudham.Contents.TEXT;
@ -47,7 +47,7 @@ class WindowsOrUnixClipboardListener extends ClipboardListener implements Runnab
OldClipboardContent oldClipboardContent = clipboardUtils.getOldClipboardContent(oldClipboardContents);
if (isTextMonitored()) {
if (TEXT.isAvailable(oldClipboard) && !FILELIST.isAvailable(oldClipboard)) {
if (TEXT.isAvailable(oldClipboard) && !FILE.isAvailable(oldClipboard)) {
String stringContent = clipboardUtils.getStringContent(newClipboardContents);
if (!stringContent.equals(oldClipboardContent.getOldText())) {
eventManager.notifyTextEvent(oldClipboardContent, stringContent);
@ -66,7 +66,7 @@ class WindowsOrUnixClipboardListener extends ClipboardListener implements Runnab
}
if (isFileMonitored()) {
if (FILELIST.isAvailable(oldClipboard)) {
if (FILE.isAvailable(oldClipboard)) {
List<File> fileList = clipboardUtils.getFileContent(newClipboardContents);
if (!fileList.equals(oldClipboardContent.getOldFiles())) {
eventManager.notifyFilesEvent(oldClipboardContent, fileList);

12
src/test/java/me/goudham/ClipboardUtilsTest.java
Unescape Escape View File

@ -19,7 +19,7 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.slf4j.Logger;
import static me.goudham.Contents.FILELIST;
import static me.goudham.Contents.FILE;
import static me.goudham.Contents.IMAGE;
import static me.goudham.Contents.TEXT;
import static org.hamcrest.MatcherAssert.assertThat;
@ -114,10 +114,10 @@ class ClipboardUtilsTest {
void failToGetFileContent() throws IOException, UnsupportedFlavorException {
List<File> expectedFileContent = null;
String expectedExceptionMessage = "Exception Thrown When Retrieving File Content";
Throwable expectedException = new UnsupportedFlavorException(FILELIST.getDataFlavor());
Throwable expectedException = new UnsupportedFlavorException(FILE.getDataFlavor());
when(transferableMock.isDataFlavorSupported(FILELIST.getDataFlavor())).thenReturn(true);
when(transferableMock.getTransferData(FILELIST.getDataFlavor())).thenThrow(expectedException);
when(transferableMock.isDataFlavorSupported(FILE.getDataFlavor())).thenReturn(true);
when(transferableMock.getTransferData(FILE.getDataFlavor())).thenThrow(expectedException);
List<File> actualFileContent = sut.getFileContent(transferableMock);
@ -170,7 +170,7 @@ class ClipboardUtilsTest {
return Stream.of(
Arguments.of(string, TEXT.getDataFlavor(), string, null, null),
Arguments.of(bufferedImage, IMAGE.getDataFlavor(), null, bufferedImage, null),
Arguments.of(files, FILELIST.getDataFlavor(), null, null, files)
Arguments.of(files, FILE.getDataFlavor(), null, null, files)
);
}
@ -197,7 +197,7 @@ class ClipboardUtilsTest {
return Stream.of(
Arguments.of(new MyClipboardContent<>(string), string, TEXT.getDataFlavor()),
Arguments.of(new MyClipboardContent<>(myBufferedImage), bufferedImage, IMAGE.getDataFlavor()),
Arguments.of(new MyClipboardContent<>(files), files, FILELIST.getDataFlavor())
Arguments.of(new MyClipboardContent<>(files), files, FILE.getDataFlavor())
);
}
}
Write Preview
Loading…
Cancel
Save