moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2024-11-16 22:35:04 -05:00
Code Issues Releases Wiki Activity

Make conflict messages more clear

Browse Source
This commit is contained in:
Reinhard Pointner 2016-07-12 13:27:07 +08:00
parent b244aba3f2
commit 700b02b172
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/net/filebot/ui/rename/RenameAction.java
View File

@ -218,10 +218,10 @@ class RenameAction extends AbstractAction {
try { try {
if (renameMap.containsKey(source)) if (renameMap.containsKey(source))
throw new IllegalArgumentException("Duplicate source file: " + source.getPath()); throw new IllegalArgumentException("Duplicate input path: " + source.getPath());
if (destinationFiles.contains(destination)) if (destinationFiles.contains(destination))
throw new IllegalArgumentException("Conflict detected: " + mapping.getValue().getPath()); throw new IllegalArgumentException("Duplicate output path: " + mapping.getValue());
if (destination.exists() && !resolve(mapping.getKey(), mapping.getValue()).equals(mapping.getKey())) if (destination.exists() && !resolve(mapping.getKey(), mapping.getValue()).equals(mapping.getKey()))
throw new IllegalArgumentException("File already exists: " + mapping.getValue().getPath()); throw new IllegalArgumentException("File already exists: " + mapping.getValue().getPath());