diff --git a/src/main/java/design/controller/ActionController.java b/src/main/java/design/controller/ActionController.java index 52d70a511afd7e90b47abe192c11c81691cfbe07..cff3c9de52e51e121c69ea2158e8b49531c9c668 100644 --- a/src/main/java/design/controller/ActionController.java +++ b/src/main/java/design/controller/ActionController.java @@ -47,15 +47,11 @@ public class ActionController { if(ImageLabel.getSelectedPictures().size()<=0) { return; } - if(ImageLabel.getCutedPictures().size() > 0) { - for(ImageLabel pNode : ImageLabel.getCutedPictures()) { - pNode.getImageView().setEffect(null); - } - ImageLabel.getCutedPictures().clear(); - } + Clipboard clipboard = Clipboard.getSystemClipboard(); ClipboardContent clipboardContent = new ClipboardContent(); clipboard.clear(); + ImageLabel.getSelectedPictureFiles().clear(); for(ImageLabel pNode : ImageLabel.getSelectedPictures()) { ImageLabel.getSelectedPictureFiles().add(pNode.getImageFile()); } @@ -74,19 +70,7 @@ public class ActionController { if (files.size() <= 0) { return; } - if (ImageLabel.getCutedPictures().size() > 0) { - File first = files.get(0); - if(first.getParentFile().getAbsolutePath().compareTo(imagePreviewController.getOldPath()) == 0){ - for(ImageLabel pNode : ImageLabel.getCutedPictures()) { - pNode.getImageView().setEffect(null); - } - ImageLabel.clearSelected(); - ImageLabel.getCutedPictures().clear(); - ImageLabel.getSelectedPictureFiles().clear(); - clipboard.clear(); - return; - } - } + for(File oldFile : files) { String newName = Pasterename(imagePreviewController.getOldPath(),oldFile.getName()); File newFile = new File(imagePreviewController.getOldPath()+File.separator+newName); @@ -108,9 +92,7 @@ public class ActionController { imagePreviewController.refreshImageViews(newFile); - if(ImageLabel.getCutedPictures().size()>0) { - oldFile.delete(); - } + } clipboard.clear(); }