Changeset 30057 in osm for applications/editors

Timestamp:

2013-11-17T20:09:32+01:00 (11 years ago)

Author:

donvip

Message:

[josm_building_tools] arbitrary housenumber increment (patch by kre3d)

File:

• applications/editors/josm/plugins/buildings_tools/src/buildings_tools/AddressDialog.java (modified) (4 diffs)

applications/editors/josm/plugins/buildings_tools/src/buildings_tools/AddressDialog.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Choice;
 import java.text.NumberFormat;
 import java.text.ParseException;
 
+import javax.swing.JSpinner;
 import javax.swing.JTextField;
+import javax.swing.SpinnerNumberModel;
 
 @SuppressWarnings("serial")
 public class AddressDialog extends MyDialog {
     private static String lhousenum, lstreetname;
-    private static boolean inc = true;
+    private static int inc = 0;
     private JTextField housenum = new JTextField();
     private JTextField streetname = new JTextField();
-    private Choice cincdec = new Choice();
+    private JSpinner incSpinner;
 
     public AddressDialog() {
@@ -26 +27 @@
         streetname.setText(lstreetname);
 
-        cincdec.add(tr("Increment"));
-        cincdec.add(tr("Decrement"));
-        cincdec.select(inc ? 0 : 1);
-        addLabelled(tr("Numbers:"), cincdec);
+        SpinnerNumberModel inc_model = new SpinnerNumberModel(0, Integer.MIN_VALUE, Integer.MAX_VALUE, 1);
+        incSpinner = new JSpinner(inc_model);
+        incSpinner.setValue(inc);
+        addLabelled(tr("Number increment:"), incSpinner);
 
         setContent(panel);
@@ -39 +40 @@
             return "";
         try {
-            Integer num = NumberFormat.getInstance().parse(lhousenum).intValue();
-            if (inc)
-                num = num + 2;
-            else
-                num = num - 2;
+            Integer num = NumberFormat.getInstance().parse(lhousenum).intValue() + inc;
             return num.toString();
         } catch (ParseException e) {
@@ -53 +50 @@
         lhousenum = housenum.getText();
         lstreetname = streetname.getText();
-        inc = cincdec.getSelectedIndex() == 0;
+        inc = (Integer) incSpinner.getValue();
     }