Changeset 1865 in josm for trunk/src/org/openstreetmap/josm/actions
- Timestamp:
- 2009-07-28T19:48:39+02:00 (15 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/actions
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java
r1820 r1865 7 7 import java.awt.event.KeyEvent; 8 8 9 import org.openstreetmap.josm.gui.layer.Layer;10 import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;11 9 import org.openstreetmap.josm.tools.Shortcut; 12 10 -
trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java
r1820 r1865 6 6 import java.awt.event.ActionEvent; 7 7 import java.awt.event.KeyEvent; 8 8 9 import javax.swing.JComponent; 9 10 10 11 import org.openstreetmap.josm.Main; 11 import org.openstreetmap.josm.gui.layer.Layer;12 import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;13 12 import org.openstreetmap.josm.tools.Shortcut; 14 13 -
trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java
r1857 r1865 16 16 import org.openstreetmap.josm.data.osm.DataSource; 17 17 import org.openstreetmap.josm.gui.OptionPaneUtil; 18 import org.openstreetmap.josm.gui.layer.Layer;19 import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;20 18 import org.openstreetmap.josm.tools.Shortcut; 21 19 -
trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java
r1857 r1865 14 14 15 15 import org.openstreetmap.josm.Main; 16 import org.openstreetmap.josm.data.SelectionChangedListener;17 16 import org.openstreetmap.josm.data.osm.DataSet; 18 17 import org.openstreetmap.josm.data.osm.OsmPrimitive; 19 18 import org.openstreetmap.josm.gui.OptionPaneUtil; 20 19 import org.openstreetmap.josm.gui.PleaseWaitRunnable; 21 import org.openstreetmap.josm.gui.layer.Layer;22 import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;23 20 import org.openstreetmap.josm.gui.progress.NullProgressMonitor; 24 21 import org.openstreetmap.josm.gui.progress.ProgressMonitor; … … 63 60 protected void handleUpdateException(Exception e) { 64 61 e.printStackTrace(); 65 JOptionPane.showMessageDialog(62 OptionPaneUtil.showMessageDialog( 66 63 Main.parent, 67 64 tr("Failed to update the selected primitives."), … … 78 75 */ 79 76 protected void handleMissingPrimitive(long id) { 80 JOptionPane.showMessageDialog(77 OptionPaneUtil.showMessageDialog( 81 78 Main.parent, 82 79 tr("Could not find primitive with id {0} in the current dataset", new Long(id).toString()), … … 114 111 msg = lastException.toString(); 115 112 } 116 JOptionPane.showMessageDialog(113 OptionPaneUtil.showMessageDialog( 117 114 Main.map, 118 115 msg, -
trunk/src/org/openstreetmap/josm/actions/UploadAction.java
r1857 r1865 169 169 return; 170 170 if (Main.map == null) { 171 JOptionPane.showMessageDialog(Main.parent,tr("Nothing to upload. Get some data first.")); 171 OptionPaneUtil.showMessageDialog( 172 Main.parent, 173 tr("Nothing to upload. Get some data first."), 174 tr("Warning"), 175 JOptionPane.WARNING_MESSAGE 176 ); 172 177 return; 173 178 } … … 203 208 204 209 if (add.isEmpty() && update.isEmpty() && delete.isEmpty()) { 205 JOptionPane.showMessageDialog(Main.parent,tr("No changes to upload.")); 210 OptionPaneUtil.showMessageDialog( 211 Main.parent, 212 tr("No changes to upload."), 213 tr("Warning"), 214 JOptionPane.WARNING_MESSAGE 215 ); 206 216 return; 207 217 } … … 350 360 ); 351 361 int optionsType = JOptionPane.YES_NO_CANCEL_OPTION; 352 int ret = JOptionPane.showOptionDialog(362 int ret = OptionPaneUtil.showOptionDialog( 353 363 null, 354 364 msg, … … 356 366 optionsType, 357 367 JOptionPane.ERROR_MESSAGE, 358 null,359 368 options, 360 369 defaultOption … … 390 399 ); 391 400 int optionsType = JOptionPane.YES_NO_OPTION; 392 int ret = JOptionPane.showOptionDialog(401 int ret = OptionPaneUtil.showOptionDialog( 393 402 null, 394 403 msg, … … 396 405 optionsType, 397 406 JOptionPane.ERROR_MESSAGE, 398 null,399 407 options, 400 408 defaultOption … … 433 441 */ 434 442 protected void handlePreconditionFailed(OsmApiException e) { 435 JOptionPane.showMessageDialog(443 OptionPaneUtil.showMessageDialog( 436 444 Main.parent, 437 445 tr("<html>Uploading to the server <strong>failed</strong> because your current<br>" … … 483 491 e.getMessage().replace("&", "&").replace("<", "<").replace(">", ">") 484 492 ); 485 JOptionPane.showMessageDialog(493 OptionPaneUtil.showMessageDialog( 486 494 Main.parent, 487 495 msg, … … 558 566 ex.getDisplayMessage() 559 567 ); 560 JOptionPane.showMessageDialog(568 OptionPaneUtil.showMessageDialog( 561 569 Main.map, 562 570 msg, … … 575 583 } 576 584 e.printStackTrace(); 577 JOptionPane.showMessageDialog(585 OptionPaneUtil.showMessageDialog( 578 586 Main.map, 579 587 msg, … … 589 597 */ 590 598 protected void handleOsmApiInitializationException(OsmApiInitializationException e) { 591 JOptionPane.showMessageDialog(599 OptionPaneUtil.showMessageDialog( 592 600 Main.parent, 593 601 tr( "Failed to initialize communication with the OSM server {0}.\n" -
trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
r1856 r1865 13 13 import org.openstreetmap.josm.command.Command; 14 14 import org.openstreetmap.josm.command.DeleteCommand; 15 import org.openstreetmap.josm.data.osm.DataSet;16 15 import org.openstreetmap.josm.data.osm.OsmPrimitive; 17 16 import org.openstreetmap.josm.data.osm.Relation;
Note:
See TracChangeset
for help on using the changeset viewer.