From 700b02b172e81f539e6e2bee52c4efb4a38e184d Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Tue, 12 Jul 2016 13:27:07 +0800 Subject: [PATCH] Make conflict messages more clear --- source/net/filebot/ui/rename/RenameAction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/net/filebot/ui/rename/RenameAction.java b/source/net/filebot/ui/rename/RenameAction.java index f7fce6de..fed983af 100644 --- a/source/net/filebot/ui/rename/RenameAction.java +++ b/source/net/filebot/ui/rename/RenameAction.java @@ -218,10 +218,10 @@ class RenameAction extends AbstractAction { try { if (renameMap.containsKey(source)) - throw new IllegalArgumentException("Duplicate source file: " + source.getPath()); + throw new IllegalArgumentException("Duplicate input path: " + source.getPath()); 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())) throw new IllegalArgumentException("File already exists: " + mapping.getValue().getPath());