Changeset 13647 in josm for trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
- Timestamp:
- 2018-04-19T20:37:16+02:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
r13206 r13647 55 55 import org.openstreetmap.josm.tools.GBC; 56 56 import org.openstreetmap.josm.tools.ImageProvider; 57 import org.openstreetmap.josm.tools.ImageResource; 57 58 import org.openstreetmap.josm.tools.InputMapUtils; 58 59 import org.openstreetmap.josm.tools.Logging; … … 364 365 putValue(NAME, tr("Cancel")); 365 366 putValue(SHORT_DESCRIPTION, tr("Close this dialog and resume editing in JOSM")); 366 new ImageProvider("cancel").getResource().attachImageIcon(this, true); 367 ImageResource resource = new ImageProvider("cancel").setOptional(true).getResource(); 368 if (resource != null) { 369 resource.attachImageIcon(this, true); 370 } 367 371 InputMapUtils.addEscapeAction(getRootPane(), this); 368 372 } … … 398 402 putValue(NAME, tr("Exit now!")); 399 403 putValue(SHORT_DESCRIPTION, tr("Exit JOSM without saving. Unsaved changes are lost.")); 400 new ImageProvider("exit").getResource().attachImageIcon(this, true);404 attachImageIcon(new ImageProvider("exit")); 401 405 break; 402 406 case RESTART: 403 407 putValue(NAME, tr("Restart now!")); 404 408 putValue(SHORT_DESCRIPTION, tr("Restart JOSM without saving. Unsaved changes are lost.")); 405 new ImageProvider("restart").getResource().attachImageIcon(this, true);409 attachImageIcon(new ImageProvider("restart")); 406 410 break; 407 411 case DELETE: 408 412 putValue(NAME, tr("Delete now!")); 409 413 putValue(SHORT_DESCRIPTION, tr("Delete layers without saving. Unsaved changes are lost.")); 410 new ImageProvider("dialogs", "delete").getResource().attachImageIcon(this, true); 411 break; 412 } 413 414 attachImageIcon(new ImageProvider("dialogs", "delete")); 415 break; 416 } 417 } 418 419 private void attachImageIcon(ImageProvider provider) { 420 ImageResource resource = provider.setOptional(true).getResource(); 421 if (resource != null) { 422 resource.attachImageIcon(this, true); 423 } 414 424 } 415 425 … … 465 475 466 476 Image getImage(String name, boolean disabled) { 467 ImageIcon img = new ImageProvider(name).setDisabled(disabled). get();477 ImageIcon img = new ImageProvider(name).setDisabled(disabled).setOptional(true).get(); 468 478 return img != null ? img.getImage() : null; 469 479 } … … 474 484 putValue(NAME, tr("Perform actions before exiting")); 475 485 putValue(SHORT_DESCRIPTION, tr("Exit JOSM with saving. Unsaved changes are uploaded and/or saved.")); 476 putValue(BASE_ICON, ImageProvider.get ("exit"));486 putValue(BASE_ICON, ImageProvider.getIfAvailable("exit")); 477 487 break; 478 488 case RESTART: 479 489 putValue(NAME, tr("Perform actions before restarting")); 480 490 putValue(SHORT_DESCRIPTION, tr("Restart JOSM with saving. Unsaved changes are uploaded and/or saved.")); 481 putValue(BASE_ICON, ImageProvider.get ("restart"));491 putValue(BASE_ICON, ImageProvider.getIfAvailable("restart")); 482 492 break; 483 493 case DELETE: 484 494 putValue(NAME, tr("Perform actions before deleting")); 485 495 putValue(SHORT_DESCRIPTION, tr("Save/Upload layers before deleting. Unsaved changes are not lost.")); 486 putValue(BASE_ICON, ImageProvider.get ("dialogs", "delete"));496 putValue(BASE_ICON, ImageProvider.getIfAvailable("dialogs", "delete")); 487 497 break; 488 498 } … … 491 501 492 502 public void redrawIcon() { 493 Image base = ((ImageIcon) getValue(BASE_ICON)).getImage();503 ImageIcon base = ((ImageIcon) getValue(BASE_ICON)); 494 504 BufferedImage newIco = new BufferedImage(ICON_SIZE*3, ICON_SIZE, BufferedImage.TYPE_4BYTE_ABGR); 495 505 Graphics2D g = newIco.createGraphics(); … … 497 507 g.drawImage(model.getLayersToUpload().isEmpty() ? upldDis : upld, ICON_SIZE*0, 0, ICON_SIZE, ICON_SIZE, null); 498 508 g.drawImage(model.getLayersToSave().isEmpty() ? saveDis : save, ICON_SIZE*1, 0, ICON_SIZE, ICON_SIZE, null); 499 g.drawImage(base, ICON_SIZE*2, 0, ICON_SIZE, ICON_SIZE, null); 509 if (base != null) { 510 g.drawImage(base.getImage(), ICON_SIZE*2, 0, ICON_SIZE, ICON_SIZE, null); 511 } 500 512 // CHECKSTYLE.ON: SingleSpaceSeparator 501 513 putValue(SMALL_ICON, new ImageIcon(newIco));
Note:
See TracChangeset
for help on using the changeset viewer.