* improved error messages

This commit is contained in:
Reinhard Pointner 2011-11-04 08:07:49 +00:00
parent 47ac797ec3
commit dc079a9d13
1 changed files with 4 additions and 4 deletions

View File

@ -101,14 +101,15 @@ class RenameAction extends AbstractAction {
} }
if (renameMap.containsKey(source)) if (renameMap.containsKey(source))
throw new IllegalArgumentException("Duplicate source file: " + source); throw new IllegalArgumentException("Duplicate source file: " + source.getName());
if (destinationSet.contains(destination)) if (destinationSet.contains(destination))
throw new IllegalArgumentException("Conflict detected: " + destination); throw new IllegalArgumentException("Conflict detected: " + mapping.getValue());
if (destination.exists() && !source.equals(destination)) if (destination.exists() && !source.equals(destination))
throw new IllegalArgumentException("File already exists: " + destination); throw new IllegalArgumentException("File already exists: " + mapping.getValue());
// use original mapping values
renameMap.put(mapping.getKey(), mapping.getValue()); renameMap.put(mapping.getKey(), mapping.getValue());
} }
@ -157,7 +158,6 @@ class RenameAction extends AbstractAction {
final ProgressDialog dialog = new ProgressDialog(parent, job); final ProgressDialog dialog = new ProgressDialog(parent, job);
// configure dialog // configure dialog
dialog.setTitle("Renaming...");
dialog.setTitle("Moving files..."); dialog.setTitle("Moving files...");
dialog.setIcon((Icon) getValue(SMALL_ICON)); dialog.setIcon((Icon) getValue(SMALL_ICON));