Index: trunk/src/org/openstreetmap/josm/data/AutosaveTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/AutosaveTask.java (revision 3433) +++ trunk/src/org/openstreetmap/josm/data/AutosaveTask.java (revision 3435) @@ -244,14 +244,21 @@ } - public List getUnsavedLayers() { - List result = new ArrayList(); - + public List getUnsavedLayersFiles() { + List result = new ArrayList(); File[] files = autosaveDir.listFiles(); if (files == null) return result; - for (File f: autosaveDir.listFiles()) { - if (f.isDirectory()) { - continue; - } + for (File file: files) { + if (file.isFile()) { + result.add(file); + } + } + return result; + } + + public List getUnsavedLayers() { + List result = new ArrayList(); + + for (File f: getUnsavedLayersFiles()) { try { DataSet ds = OsmReader.parseDataSet(new FileInputStream(f), NullProgressMonitor.INSTANCE); Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 3433) +++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 3435) @@ -10,4 +10,5 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.File; import java.net.Authenticator; import java.net.ProxySelector; @@ -247,6 +248,6 @@ AutosaveTask autosaveTask = new AutosaveTask(); - List unsavedLayers = autosaveTask.getUnsavedLayers(); - if (!unsavedLayers.isEmpty()) { + List unsavedLayerFiles = autosaveTask.getUnsavedLayersFiles(); + if (!unsavedLayerFiles.isEmpty()) { ExtendedDialog dialog = new ExtendedDialog( Main.parent, @@ -255,10 +256,9 @@ ); dialog.setContent(tr("JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last time. Do you want to restore data?", - unsavedLayers.size())); - dialog.setIcon(JOptionPane.INFORMATION_MESSAGE); + unsavedLayerFiles.size())); dialog.setButtonIcons(new String[] {"ok.png", "cancel.png"}); dialog.showDialog(); if (dialog.getValue() == 1) { - for (OsmDataLayer layer: unsavedLayers) { + for (OsmDataLayer layer: autosaveTask.getUnsavedLayers()) { Main.main.addLayer(layer); } @@ -305,9 +305,9 @@ if (version.startsWith("1.5") || version.startsWith("5")) { JLabel ho = new JLabel(""+ - tr("

JOSM requires Java version 6.

"+ - "Detected Java version: {0}.
"+ - "You can
  • update your Java (JRE) or
    • "+ - "
  • use an earlier (Java 5 compatible) version of JOSM.
"+ - "More Info:", version)+""); + tr("

JOSM requires Java version 6.

"+ + "Detected Java version: {0}.
"+ + "You can
  • update your Java (JRE) or
    • "+ + "
  • use an earlier (Java 5 compatible) version of JOSM.
"+ + "More Info:", version)+""); JTextArea link = new JTextArea("http://josm.openstreetmap.de/wiki/Help/SystemRequirements"); link.setEditable(false);