Changeset 13559 in osm for applications

Timestamp:

2009-02-06T13:11:57+01:00 (16 years ago)

Author:

zere

Message:

Fixed bug when not checking the return value of a dialogue box.

File:

• applications/editors/josm/plugins/terracer/src/terracer/TerracerAction.java (modified) (2 diffs)

applications/editors/josm/plugins/terracer/src/terracer/TerracerAction.java

@@ -67 +67 @@
                                 if ((way.nodes.size() == 5) &&
                                                 way.isClosed()) {
-                                        terraceBuilding(way);
-
+                                        // first ask the user how many buildings to terrace into
+                                        String answer = 
+                                                JOptionPane.showInputDialog(
+                                                                tr("How many buildings are in the terrace?"));
+                                        
+                                        // if the answer was null then the user clicked "Cancel"
+                                        if (answer != null) {
+                                                int nb = Integer.parseInt(answer);
+                                                terraceBuilding(way, nb);
+                                        }
                                 } else {
                                         badSelect = true;
@@ -94 +102 @@
          * 
          * @param w The closed, quadrilateral way to terrace.
+         * @param nb The number of buildings to terrace into.
          */
-        private void terraceBuilding(Way w) {
-                // first ask the user how many buildings to terrace into
-                int nb = Integer.parseInt(
-                                JOptionPane.showInputDialog(
-                                                tr("How many buildings are in the terrace?")));
+        private void terraceBuilding(Way w, int nb) {
 
                 // now find which is the longest side connecting the first node