Changeset 5438 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2012-08-13T00:12:48+02:00 (12 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 1 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
r5219 r5438 71 71 import org.openstreetmap.josm.gui.preferences.SourceEntry; 72 72 import org.openstreetmap.josm.gui.widgets.HtmlPanel; 73 import org.openstreetmap.josm.gui.widgets.JFileChooserManager; 73 74 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher; 74 75 import org.openstreetmap.josm.tools.GBC; … … 522 523 final StyleSource s = model.getRow(sel); 523 524 524 String curDir = Main.pref.get("mappaint.clone-style.lastDirectory", System.getProperty("user.home")); 525 526 String suggestion = curDir + File.separator + s.getFileNamePart(); 527 JFileChooser fc = new JFileChooser(); 528 fc.setSelectedFile(new File(suggestion)); 529 530 int answer = fc.showSaveDialog(Main.parent); 531 if (answer != JFileChooser.APPROVE_OPTION) 525 JFileChooserManager fcm = new JFileChooserManager(false, "mappaint.clone-style.lastDirectory", System.getProperty("user.home")); 526 String suggestion = fcm.getInitialDirectory() + File.separator + s.getFileNamePart(); 527 fcm.createFileChooser().getFileChooser().setSelectedFile(new File(suggestion)); 528 JFileChooser fc = fcm.openFileChooser(); 529 if (fc == null) 532 530 return; 533 531 534 if (!fc.getCurrentDirectory().getAbsolutePath().equals(curDir)) {535 Main.pref.put("mappaint.clone-style.lastDirectory", fc.getCurrentDirectory().getAbsolutePath());536 }537 532 File file = fc.getSelectedFile(); 538 533 -
trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
r5429 r5438 62 62 import org.openstreetmap.josm.Main; 63 63 import org.openstreetmap.josm.actions.AbstractMergeAction.LayerListCellRenderer; 64 import org.openstreetmap.josm.actions.DiskAccessAction; 64 65 import org.openstreetmap.josm.actions.RenameLayerAction; 65 66 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTaskList; … … 95 96 import org.openstreetmap.josm.gui.progress.ProgressTaskIds; 96 97 import org.openstreetmap.josm.gui.widgets.HtmlPanel; 98 import org.openstreetmap.josm.gui.widgets.JFileChooserManager; 97 99 import org.openstreetmap.josm.gui.widgets.JosmComboBox; 98 100 import org.openstreetmap.josm.io.JpgImporter; … … 1909 1911 return; 1910 1912 } 1911 String dir = Main.pref.get("markers.lastaudiodirectory"); 1912 JFileChooser fc = new JFileChooser(dir); 1913 fc.setFileSelectionMode(JFileChooser.FILES_ONLY); 1914 fc.setAcceptAllFileFilterUsed(false); 1915 fc.setFileFilter(new FileFilter() { 1913 FileFilter filter = new FileFilter() { 1916 1914 @Override 1917 1915 public boolean accept(File f) { … … 1923 1921 return tr("Wave Audio files (*.wav)"); 1924 1922 } 1925 }); 1926 fc.setMultiSelectionEnabled(true); 1927 if (fc.showOpenDialog(Main.parent) == JFileChooser.APPROVE_OPTION) { 1928 if (!fc.getCurrentDirectory().getAbsolutePath().equals(dir)) { 1929 Main.pref.put("markers.lastaudiodirectory", fc.getCurrentDirectory().getAbsolutePath()); 1930 } 1931 1923 }; 1924 JFileChooser fc = DiskAccessAction.createAndOpenFileChooser(true, true, null, filter, JFileChooser.FILES_ONLY, "markers.lastaudiodirectory"); 1925 if (fc != null) { 1932 1926 File sel[] = fc.getSelectedFiles(); 1933 1927 // sort files in increasing order of timestamp (this is the end time, but so … … 1968 1962 Main.map.repaint(); 1969 1963 } 1970 1971 1964 } 1972 1965 } … … 2010 2003 return; 2011 2004 } 2012 String curDir = Main.pref.get("geoimage.lastdirectory", Main.pref.get("lastDirectory")); 2013 if (curDir.equals("")) { 2014 curDir = "."; 2015 } 2016 JFileChooser fc = new JFileChooser(new File(curDir)); 2017 2018 fc.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES); 2019 fc.setMultiSelectionEnabled(true); 2020 fc.setAcceptAllFileFilterUsed(false); 2005 2021 2006 JpgImporter importer = new JpgImporter(GpxLayer.this); 2022 fc.setFileFilter(importer.filter); 2023 fc.showOpenDialog(Main.parent); 2024 LinkedList<File> files = new LinkedList<File>(); 2025 File[] sel = fc.getSelectedFiles(); 2026 if (sel == null || sel.length == 0) 2027 return; 2028 if (!fc.getCurrentDirectory().getAbsolutePath().equals(curDir)) { 2029 Main.pref.put("geoimage.lastdirectory", fc.getCurrentDirectory().getAbsolutePath()); 2030 } 2031 addRecursiveFiles(files, sel); 2032 importer.importDataHandleExceptions(files, NullProgressMonitor.INSTANCE); 2007 JFileChooser fc = new JFileChooserManager(true, "geoimage.lastdirectory", Main.pref.get("lastDirectory")). 2008 createFileChooser(true, null, importer.filter, JFileChooser.FILES_AND_DIRECTORIES).openFileChooser(); 2009 if (fc != null) { 2010 File[] sel = fc.getSelectedFiles(); 2011 if (sel != null && sel.length > 0) { 2012 LinkedList<File> files = new LinkedList<File>(); 2013 addRecursiveFiles(files, sel); 2014 importer.importDataHandleExceptions(files, NullProgressMonitor.INSTANCE); 2015 } 2016 } 2033 2017 } 2034 2018 } -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
r5429 r5438 65 65 66 66 import org.openstreetmap.josm.Main; 67 import org.openstreetmap.josm.actions.DiskAccessAction; 67 68 import org.openstreetmap.josm.data.gpx.GpxData; 68 69 import org.openstreetmap.josm.data.gpx.GpxTrack; … … 134 135 135 136 public void actionPerformed(ActionEvent arg0) { 136 JFileChooser fc = new JFileChooser(Main.pref.get("lastDirectory")); 137 fc.setFileSelectionMode(JFileChooser.FILES_ONLY); 138 fc.setAcceptAllFileFilterUsed(false); 139 fc.setMultiSelectionEnabled(false); 140 fc.setFileSelectionMode(JFileChooser.FILES_ONLY); 141 fc.setFileFilter(new FileFilter(){ 137 FileFilter filter = new FileFilter(){ 142 138 @Override public boolean accept(File f) { 143 139 return (f.isDirectory() … … 148 144 return tr("GPX Files (*.gpx *.gpx.gz)"); 149 145 } 150 }); 151 fc.showOpenDialog(Main.parent); 146 }; 147 JFileChooser fc = DiskAccessAction.createAndOpenFileChooser(true, false, null, filter, JFileChooser.FILES_ONLY, null); 148 if (fc == null) 149 return; 152 150 File sel = fc.getSelectedFile(); 153 if (sel == null)154 return;155 151 156 152 try { 157 153 outerPanel.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); 158 159 Main.pref.put("lastDirectory", sel.getPath());160 154 161 155 for (int i = gpxLst.size() - 1 ; i >= 0 ; i--) { … … 375 369 376 370 public void actionPerformed(ActionEvent arg0) { 377 JFileChooser fc = new JFileChooser(Main.pref.get("geoimage.lastdirectory")); 378 fc.setAcceptAllFileFilterUsed(false); 379 fc.setMultiSelectionEnabled(false); 380 fc.setFileSelectionMode(JFileChooser.FILES_ONLY); 381 fc.setFileFilter(JpegFileFilter.getInstance()); 382 fc.showOpenDialog(Main.parent); 371 JFileChooser fc = DiskAccessAction.createAndOpenFileChooser(true, false, null, JpegFileFilter.getInstance(), JFileChooser.FILES_ONLY, "geoimage.lastdirectory"); 372 if (fc == null) 373 return; 383 374 File sel = fc.getSelectedFile(); 384 if (sel == null)385 return;386 375 387 376 Integer orientation = null; -
trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
r5220 r5438 75 75 import org.openstreetmap.josm.gui.HelpAwareOptionPane; 76 76 import org.openstreetmap.josm.gui.PleaseWaitRunnable; 77 import org.openstreetmap.josm.gui.widgets.JFileChooserManager; 77 78 import org.openstreetmap.josm.io.MirroredInputStream; 78 79 import org.openstreetmap.josm.io.OsmTransferException; … … 751 752 752 753 public void actionPerformed(ActionEvent e) { 753 JFileChooser fc= new JFileChooser();754 prepareFileChooser(tfURL.getText(), fc );755 int ret = fc.showOpenDialog(JOptionPane.getFrameForComponent(SourceEditor.this));756 if ( ret != JFileChooser.APPROVE_OPTION)757 return;758 tfURL.setText(fc.getSelectedFile().toString());754 JFileChooserManager fcm = new JFileChooserManager(true); 755 prepareFileChooser(tfURL.getText(), fcm.getFileChooser()); 756 JFileChooser fc = fcm.openFileChooser(JOptionPane.getFrameForComponent(SourceEditor.this)); 757 if (fc != null) { 758 tfURL.setText(fc.getSelectedFile().toString()); 759 } 759 760 } 760 761 } … … 1285 1286 private CopyOnWriteArrayList<CellEditorListener> listeners; 1286 1287 private String value; 1287 private JFileChooser fileChooser;1288 1288 private boolean isFile; 1289 1290 protected JFileChooser getFileChooser() {1291 if (fileChooser == null) {1292 this.fileChooser = new JFileChooser();1293 if(!isFile) {1294 fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);1295 }1296 }1297 return fileChooser;1298 }1299 1289 1300 1290 /** … … 1428 1418 1429 1419 public void actionPerformed(ActionEvent e) { 1430 JFileChooser fc = getFileChooser(); 1431 prepareFileChooser(tfFileName.getText(), fc); 1432 int ret = fc.showOpenDialog(JOptionPane.getFrameForComponent(SourceEditor.this)); 1433 if (ret != JFileChooser.APPROVE_OPTION) 1434 return; 1435 tfFileName.setText(fc.getSelectedFile().toString()); 1420 JFileChooserManager fcm = new JFileChooserManager(true).createFileChooser(); 1421 if (!isFile) { 1422 fcm.getFileChooser().setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); 1423 } 1424 prepareFileChooser(tfFileName.getText(), fcm.getFileChooser()); 1425 JFileChooser fc = fcm.openFileChooser(JOptionPane.getFrameForComponent(SourceEditor.this)); 1426 if (fc != null) { 1427 tfFileName.setText(fc.getSelectedFile().toString()); 1428 } 1436 1429 } 1437 1430 } -
trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java
r5203 r5438 2 2 package org.openstreetmap.josm.gui.preferences.advanced; 3 3 4 import static org.openstreetmap.josm.tools.I18n.marktr; 4 5 import static org.openstreetmap.josm.tools.I18n.tr; 5 import static org.openstreetmap.josm.tools.I18n.marktr;6 6 7 7 import java.awt.Color; … … 14 14 import java.awt.event.MouseAdapter; 15 15 import java.awt.event.MouseEvent; 16 17 16 import java.io.File; 18 17 import java.util.ArrayList; … … 43 42 44 43 import org.openstreetmap.josm.Main; 44 import org.openstreetmap.josm.actions.DiskAccessAction; 45 45 import org.openstreetmap.josm.data.CustomConfigurator; 46 46 import org.openstreetmap.josm.data.Preferences; … … 316 316 317 317 private File[] askUserForCustomSettingsFiles(boolean saveFileFlag, String title) { 318 String dir = Main.pref.get("customsettings.lastDirectory"); 319 if (dir.length()==0) dir ="."; 320 321 JFileChooser fc = new JFileChooser(dir); 322 fc.setDialogTitle(title); 323 fc.setFileSelectionMode(JFileChooser.FILES_ONLY); 324 fc.setAcceptAllFileFilterUsed(false); 325 fc.setFileFilter(new FileFilter() { 318 FileFilter filter = new FileFilter() { 326 319 @Override 327 320 public boolean accept(File f) { … … 332 325 return tr("JOSM custom settings files (*.xml)"); 333 326 } 334 }); 335 336 fc.setMultiSelectionEnabled(!saveFileFlag); 337 int result = saveFileFlag? fc.showSaveDialog(Main.parent) : fc.showOpenDialog(Main.parent); 338 if (result == JFileChooser.APPROVE_OPTION) { 339 if (!fc.getCurrentDirectory().getAbsolutePath().equals(dir)) { 340 Main.pref.put("customsettings.lastDirectory", fc.getCurrentDirectory().getAbsolutePath()); 341 } 342 File sel[] = fc.isMultiSelectionEnabled() ? fc.getSelectedFiles() : (new File[]{fc.getSelectedFile()}); 343 if (sel.length==1 && !sel[0].getName().contains(".")) sel[0]=new File(sel[0].getAbsolutePath()+".xml"); 344 return sel; 345 } 346 return new File[0]; 327 }; 328 JFileChooser fc = DiskAccessAction.createAndOpenFileChooser(!saveFileFlag, !saveFileFlag, title, filter, JFileChooser.FILES_ONLY, "customsettings.lastDirectory"); 329 if (fc != null) { 330 File sel[] = fc.isMultiSelectionEnabled() ? fc.getSelectedFiles() : (new File[]{fc.getSelectedFile()}); 331 if (sel.length==1 && !sel[0].getName().contains(".")) sel[0]=new File(sel[0].getAbsolutePath()+".xml"); 332 return sel; 333 } 334 return new File[0]; 347 335 } 348 336
Note:
See TracChangeset
for help on using the changeset viewer.