Changeset 30651 in osm for applications/editors/josm/plugins/turnrestrictions/src

Timestamp:

2014-09-17T01:38:16+02:00 (10 years ago)

Author:

donvip

Message:

[josm_turnrestrictions] fix #josm8197 - add moped as supported exception

Location:

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor

Files:

• ExceptValueModel.java (modified) (1 diff)
• VehicleExceptionEditor.java (modified) (4 diffs)

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ExceptValueModel.java

@@ -24 +24 @@
         s.add("hgv");
         s.add("bicycle");
+        s.add("moped");
         s.add("motorcar");
         STANDARD_VEHICLE_EXCEPTION_VALUES = Collections.unmodifiableSet(s);

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java

@@ -40 +40 @@
     private JCheckBox cbPsv;
     private JCheckBox cbBicyle;
+    private JCheckBox cbMoped;
     private JCheckBox cbHgv;
     private JCheckBox cbMotorcar;
@@ -124 +125 @@
         lbl.setIcon(ImageProvider.get("vehicle", "bicycle"));
         
-
         gc.weightx = 0.0;
         gc.gridx++;
         pnlStandard.add(cbBicyle, gc);
+        gc.weightx = 1.0;
+        gc.gridx++;
+        pnlStandard.add(lbl, gc);
+        
+        cbMoped = new JCheckBox();
+        cbMoped.addItemListener(svtChangeListener);
+        lbl = new JLabel(tr("Mopeds"));
+        lbl.setIcon(ImageProvider.get("vehicle", "moped"));
+        
+        gc.weightx = 0.0;
+        gc.gridx = 0;
+        gc.gridy = 2;
+        pnlStandard.add(cbMoped, gc);
         gc.weightx = 1.0;
         gc.gridx++;
@@ -238 +251 @@
             cbPsv.setSelected(exceptValue.isVehicleException("psv"));
             cbBicyle.setSelected(exceptValue.isVehicleException("bicycle"));
+            cbMoped.setSelected(exceptValue.isVehicleException("moped"));
             cbMotorcar.setSelected(exceptValue.isVehicleException("motorcar"));
             cbHgv.setSelected(exceptValue.isVehicleException("hgv"));
@@ -318 +332 @@
             if (!enabled) return;
             exceptValue.setVehicleException("bicycle", cbBicyle.isSelected());
+            exceptValue.setVehicleException("moped", cbMoped.isSelected());
             exceptValue.setVehicleException("hgv", cbHgv.isSelected());
             exceptValue.setVehicleException("psv", cbPsv.isSelected());