Changeset 2169 in josm
- Timestamp:
- 2009-09-20T12:25:17+02:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/Main.java
r2162 r2169 2 2 package org.openstreetmap.josm; 3 3 import static org.openstreetmap.josm.tools.I18n.tr; 4 import static org.openstreetmap.josm.tools.I18n.trn;5 4 6 5 import java.awt.BorderLayout; … … 26 25 import javax.swing.JComponent; 27 26 import javax.swing.JFrame; 28 import javax.swing.JLabel;29 27 import javax.swing.JOptionPane; 30 28 import javax.swing.JPanel; … … 32 30 33 31 import org.openstreetmap.josm.actions.OpenFileAction; 34 import org.openstreetmap.josm.actions.SaveAction;35 32 import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask; 36 33 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask; … … 44 41 import org.openstreetmap.josm.data.projection.Mercator; 45 42 import org.openstreetmap.josm.data.projection.Projection; 46 import org.openstreetmap.josm.gui.ExtendedDialog;47 43 import org.openstreetmap.josm.gui.GettingStarted; 48 44 import org.openstreetmap.josm.gui.MainMenu; … … 423 419 } 424 420 425 /**426 * Saves all {@see OsmDataLayer}s with an associated file and with unsaved427 * data modifications.428 *429 * @return true, if the save operation was successful; false, otherwise430 */431 public static boolean saveUnsavedModifications_old() {432 Shortcut.savePrefs();433 if (map == null)434 return true; // nothing to save, return success435 436 int numUnsavedLayers = 0;437 for (final OsmDataLayer l : map.mapView.getLayersOfType(OsmDataLayer.class)) {438 if (l.requiresSaveToFile()) {439 numUnsavedLayers++;440 }441 }442 if (numUnsavedLayers == 0)443 return true; // nothing to save, return success444 445 String msg = trn(446 "There are unsaved changes in {0} layer. Discard the changes and continue?",447 "There are unsaved changes in {0} layers. Discard the changes and continue?",448 numUnsavedLayers,449 numUnsavedLayers450 );451 452 ExtendedDialog ed = new ExtendedDialog(parent,453 tr("Unsaved Changes"),454 new String[] {tr("Save and Exit"), tr("Discard and Exit"), tr("Cancel")});455 ed.setButtonIcons(new String[] {"save.png", "exit.png", "cancel.png"});456 ed.setContent(new JLabel(msg));457 ed.showDialog();458 459 switch(ed.getValue()) {460 case 2: /* discard and exit */ return true;461 case 3: /* cancel */ return false;462 }463 boolean savefailed = false;464 for (OsmDataLayer l : map.mapView.getLayersOfType(OsmDataLayer.class)) {465 if(!new SaveAction().doSave(l)) {466 savefailed = true;467 }468 }469 return !savefailed;470 }471 472 421 private static void downloadFromParamString(final boolean rawGps, String s) { 473 422 if (s.startsWith("http:")) { … … 600 549 newGeometry = width + "x" + height + "+" + x + "+" + y; 601 550 } 602 551 603 552 newToggleDlgWidth = Integer.toString(map.getToggleDlgWidth()); 604 553 if (newToggleDlgWidth.equals(Integer.toString(map.DEF_TOGGLE_DLG_WIDTH))) { … … 612 561 pref.put("toggleDialogs.width", newToggleDlgWidth); 613 562 } 614 615 616 563 }
Note:
See TracChangeset
for help on using the changeset viewer.