Ticket #6255: no-relative-paths.patch

File no-relative-paths.patch, 1.6 KB (added by xeen, 15 years ago)

easy enough fix. Also sneaks in some other small goodies :)

  • src/org/openstreetmap/josm/actions/OpenFileAction.java

     
    1717import java.util.LinkedHashSet;
    1818import java.util.LinkedList;
    1919import java.util.List;
    20 
    2120import java.util.Set;
     21
    2222import javax.swing.JFileChooser;
    2323import javax.swing.JOptionPane;
    2424import javax.swing.SwingUtilities;
     
    197197            getProgressMonitor().setTicksCount(files.size());
    198198
    199199            if (chosenImporter != null) {
    200                 // The importer was expicitely chosen, so use it.
     200                // The importer was explicitly chosen, so use it.
    201201                List<File> filesNotMatchingWithImporter = new LinkedList<File>();
    202202                List<File> filesMatchingWithImporter = new LinkedList<File>();
    203203                for (final File f : files) {
     
    261261                        // remove the files which didn't fail to load from the failed list
    262262                        failedFiles.removeAll(successfullyOpenedFiles);
    263263                        for (File f : successfullyOpenedFiles) {
    264                             fileHistory.add(f.getPath());
     264                            fileHistory.add(f.getCanonicalPath());
    265265                        }
    266266                        for (File f : failedFiles) {
    267                             failedAll.add(f.getPath());
     267                            failedAll.add(f.getCanonicalPath());
    268268                        }
    269269                    }
    270270                }