Changeset 3431 in josm


Ignore:
Timestamp:
2010-08-13T22:00:38+02:00 (9 years ago)
Author:
bastiK
Message:

added purge action (some testing would be welcome)

Location:
trunk
Files:
4 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

    r3392 r3431  
    488488                    tr("You are about to delete incomplete objects."
    489489                            + "<br>"
    490                             + "This will cause problems because you don't see the real object."
     490                            + "This will cause problems because you don''t see the real object."
    491491                            + "<br>" + "Do you really want to delete?") + "</html>"));
    492492            boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
  • trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

    r3426 r3431  
    399399    }
    400400
     401    /**
     402     * @return whether the selection is empty or not
     403     */
     404    public boolean selectionEmpty() {
     405        return selectedPrimitives.isEmpty();
     406    }
     407
    401408    public boolean isSelected(OsmPrimitive osm) {
    402409        return selectedPrimitives.contains(osm);
  • trunk/src/org/openstreetmap/josm/gui/MainApplication.java

    r3417 r3431  
    256256            dialog.setContent(tr("JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last time. Do you want to restore data?",
    257257                    unsavedLayers.size()));
     258            dialog.setIcon(JOptionPane.INFORMATION_MESSAGE);
    258259            dialog.setButtonIcons(new String[] {"ok.png", "cancel.png"});
    259260            dialog.showDialog();
     
    299300        String version = System.getProperty("java.version");
    300301        if (version != null) {
    301             if (version.startsWith("1.6") || version.startsWith("6"))
     302            if (version.startsWith("1.6") || version.startsWith("6") ||
     303                    version.startsWith("1.7") || version.startsWith("7"))
    302304                return;
    303305            if (version.startsWith("1.5") || version.startsWith("5")) {
  • trunk/src/org/openstreetmap/josm/gui/MainMenu.java

    r3388 r3431  
    5555import org.openstreetmap.josm.actions.PasteTagsAction;
    5656import org.openstreetmap.josm.actions.PreferencesAction;
     57import org.openstreetmap.josm.actions.PurgeAction;
    5758import org.openstreetmap.josm.actions.RedoAction;
    5859import org.openstreetmap.josm.actions.ReverseWayAction;
     
    123124    public final JosmAction duplicate = new DuplicateAction();
    124125    public final JosmAction delete = new DeleteAction();
     126    public final JosmAction purge = new PurgeAction();
    125127    public final JosmAction merge = new MergeLayerAction();
    126128    public final JosmAction mergeSelected = new MergeSelectionAction();
     
    247249        add(editMenu, duplicate);
    248250        add(editMenu, delete);
     251        add(editMenu, purge);
    249252        editMenu.addSeparator();
    250253        add(editMenu,merge);
  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

    r3338 r3431  
    11011101                putValue(NAME, tr("Select relation"));
    11021102                putValue(SHORT_DESCRIPTION, tr("Select relation in main selection."));
     1103                putValue(SMALL_ICON, ImageProvider.get("dialogs", "select"));
    11031104            } else {
    11041105                putValue(NAME, tr("Select in relation list"));
    11051106                putValue(SHORT_DESCRIPTION, tr("Select relation in relation list."));
     1107                putValue(SMALL_ICON, ImageProvider.get("dialogs", "relationlist"));
    11061108            }
    11071109        }
Note: See TracChangeset for help on using the changeset viewer.