Changeset 3431 in josm

Timestamp:

Aug 13, 2010 10:00:38 PM (3 years ago)

Author:

bastiK

Message:

added purge action (some testing would be welcome)

Location:

trunk

Files:

• images/data/purge.png (added)
• images/purge.png (added)
• src/org/openstreetmap/josm/actions/PurgeAction.java (added)
• src/org/openstreetmap/josm/command/DeleteCommand.java (modified) (1 diff)
• src/org/openstreetmap/josm/command/PurgeCommand.java (added)
• src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/MainApplication.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/MainMenu.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -488 +488 @@
                     tr("You are about to delete incomplete objects."
                             + "<br>"
-                            + "This will cause problems because you don't see the real object."
+                            + "This will cause problems because you don''t see the real object."
                             + "<br>" + "Do you really want to delete?") + "</html>"));
             boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -399 +399 @@
     }
 
+    /**
+     * @return whether the selection is empty or not
+     */
+    public boolean selectionEmpty() {
+        return selectedPrimitives.isEmpty();
+    }
+
     public boolean isSelected(OsmPrimitive osm) {
         return selectedPrimitives.contains(osm);

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -256 +256 @@
             dialog.setContent(tr("JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last time. Do you want to restore data?",
                     unsavedLayers.size()));
+            dialog.setIcon(JOptionPane.INFORMATION_MESSAGE);
             dialog.setButtonIcons(new String[] {"ok.png", "cancel.png"});
             dialog.showDialog();
@@ -299 +300 @@
         String version = System.getProperty("java.version");
         if (version != null) {
-            if (version.startsWith("1.6") || version.startsWith("6"))
+            if (version.startsWith("1.6") || version.startsWith("6") ||
+                    version.startsWith("1.7") || version.startsWith("7"))
                 return;
             if (version.startsWith("1.5") || version.startsWith("5")) {

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -55 +55 @@
 import org.openstreetmap.josm.actions.PasteTagsAction;
 import org.openstreetmap.josm.actions.PreferencesAction;
+import org.openstreetmap.josm.actions.PurgeAction;
 import org.openstreetmap.josm.actions.RedoAction;
 import org.openstreetmap.josm.actions.ReverseWayAction;
@@ -123 +124 @@
     public final JosmAction duplicate = new DuplicateAction();
     public final JosmAction delete = new DeleteAction();
+    public final JosmAction purge = new PurgeAction();
     public final JosmAction merge = new MergeLayerAction();
     public final JosmAction mergeSelected = new MergeSelectionAction();
@@ -247 +249 @@
         add(editMenu, duplicate);
         add(editMenu, delete);
+        add(editMenu, purge);
         editMenu.addSeparator();
         add(editMenu,merge);

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -1101 +1101 @@
                 putValue(NAME, tr("Select relation"));
                 putValue(SHORT_DESCRIPTION, tr("Select relation in main selection."));
+                putValue(SMALL_ICON, ImageProvider.get("dialogs", "select"));
             } else {
                 putValue(NAME, tr("Select in relation list"));
                 putValue(SHORT_DESCRIPTION, tr("Select relation in relation list."));
+                putValue(SMALL_ICON, ImageProvider.get("dialogs", "relationlist"));
             }
         }