Changeset 30614 in osm for applications/editors/josm

Timestamp:

2014-08-31T02:57:28+02:00 (10 years ago)

Author:

donvip

Message:

[josm_terracer] likely fix #josm10293 - focus potential issue

Location:

applications/editors/josm/plugins/terracer/src/terracer

Files:

• HouseNumberInputDialog.java (modified) (1 diff)
• HouseNumberInputHandler.java (modified) (2 diffs)
• TerracerAction.java (modified) (1 diff)

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

@@ -117 +117 @@
         setupDialog();
         getRootPane().setDefaultButton(defaultButton);
-        setVisible(true);
-        lo.requestFocus();
+        pack();
+        lo.requestFocusInWindow();
     }
 

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

@@ -48 +48 @@
     private final Way outline, street;
     private final String streetName;
-    private final String buildingType;
     private final Node init;
     private final Relation associatedStreet;
@@ -78 +77 @@
         this.street = street;
         this.streetName = streetName;
-        this.buildingType = buildingType;
         this.associatedStreet = associatedStreet;
         this.housenumbers = housenumbers;
 
-        // This dialog is started modal
         this.dialog = new HouseNumberInputDialog(this, street, streetName, buildingType,
                 associatedStreet != null, housenumbers);
-
-        // We're done
     }
 

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

@@ -232 +232 @@
             // show input dialog.
             new HouseNumberInputHandler(this, outline, init, street, streetname, outline.get("building"),
-                    associatedStreet, housenumbers, title);
+                    associatedStreet, housenumbers, title).dialog.showDialog();
         }
     }