Changeset 104 in josm for src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

Timestamp:

2006-07-03T00:31:24+02:00 (18 years ago)

Author:

imi

Message:

• started i18n
• started "download incomplete ways" action
• added straight line selection mode

File:

• src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified) (6 diffs)

src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

@@ -1 +1 @@
 package org.openstreetmap.josm.actions.mapmode;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.ActionEvent;
@@ -51 +53 @@
          */
         public DeleteAction(MapFrame mapFrame) {
-                super("Delete", 
+                super(tr("Delete"), 
                                 "delete", 
-                                "Delete nodes, streets or segments.", 
+                                tr("Delete nodes, streets or segments."), 
                                 "D", 
                                 KeyEvent.VK_D, 
@@ -146 +148 @@
                                         String reason = deleteNodeAndJoinSegment((Node)osm);
                                         if (reason != null && msgBox) {
-                                                JOptionPane.showMessageDialog(Main.parent, "Cannot delete node. "+reason);
+                                                JOptionPane.showMessageDialog(Main.parent,tr("Cannot delete node.")+" "+reason);
                                                 return;
                                         }
                                 } else if (msgBox) {
-                                        JOptionPane.showMessageDialog(Main.parent, "This object is in use.");
+                                        JOptionPane.showMessageDialog(Main.parent, tr("This object is in use."));
                                         return;
                                 }
@@ -167 +169 @@
                         if (!s.deleted && (s.from == n || s.to == n)) {
                                 if (segs.size() > 1)
-                                        return "Used by more than two segments.";
+                                        return tr("Used by more than two segments.");
                                 segs.add(s);
                         }
                 }
                 if (segs.size() != 2)
-                        return "Used by only one segment.";
+                        return tr("Used by only one segment.");
                 Segment seg1 = segs.get(0);
                 Segment seg2 = segs.get(1);
@@ -182 +184 @@
                 for (Way w : Main.ds.ways)
                         if (!w.deleted && (w.segments.contains(seg1) || w.segments.contains(seg2)))
-                                return "Used in a way.";
+                                return tr("Used in a way.");
                 if (seg1.from == seg2.from || seg1.to == seg2.to)
-                        return "Wrong direction of segments.";
+                        return tr("Wrong direction of segments.");
                 for (Entry<String, String> e : seg1.entrySet())
                         if (seg2.keySet().contains(e.getKey()) && !seg2.get(e.getKey()).equals(e.getValue()))
-                                return "Conflicting keys";
+                                return tr("Conflicting keys");
                 Segment s = new Segment(seg1);
                 s.to = seg2.to;
@@ -197 +199 @@
                         new ChangeCommand(seg1, s), 
                         new DeleteCommand(Arrays.asList(new OsmPrimitive[]{n, seg2}))};
-                Main.main.editLayer().add(new SequenceCommand("Delete Node", Arrays.asList(cmds)));
+                Main.main.editLayer().add(new SequenceCommand(tr("Delete Node"), Arrays.asList(cmds)));
                 return null;
     }