Changeset 34726 in osm

Timestamp:

2018-11-18T20:27:55+01:00 (6 years ago)

Author:

bwr57

Message:

Fixed errors

Location:

applications/editors/josm/plugins/CustomizePublicTransportStop

Files:

• JOSM-CustomizePublicTransportStop.iml (added)
• Text (added)
• Text/en.txt (added)
• Text/es.txt (added)
• Text/ru.txt (added)
• data/en.lang (modified) ( previous)
• data/es.lang (modified) ( previous)
• data/ru.lang (modified) ( previous)
• josm-tested.jar.iml (added)
• src/META-INF (added)
• src/META-INF/MANIFEST.MF (added)
• src/org/openstreetmap/josm/plugins/customizepublictransportstop/CreateStopAreaFromSelectedObjectOperation.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/customizepublictransportstop/CustomizePublicTransportStopDialog.java (modified) (32 diffs)
• src/org/openstreetmap/josm/plugins/customizepublictransportstop/CustomizeStopAreaOperation.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/customizepublictransportstop/OSMTags.java (modified) (1 diff)

applications/editors/josm/plugins/CustomizePublicTransportStop/src/org/openstreetmap/josm/plugins/customizepublictransportstop/CreateStopAreaFromSelectedObjectOperation.java

@@ -10 +10 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
+import sun.security.provider.certpath.IndexedCollectionCertStore;
 
 /**
@@ -95 +96 @@
      * Setting of stop area from selected josm object
      * 
-     * @param selectedObject Selected josm object
+     * @param stopArea Selected stop area
      */
     public void fromSelectedObject(StopArea stopArea) {
@@ -156 +157 @@
         if (getCurrentDataSet() == null)
             return null;
-        OsmPrimitive selectedObject = getCurrentDataSet().getSelectedNodesAndWays().iterator().next();
+        Collection<OsmPrimitive> selectedObjects = getCurrentDataSet().getSelectedNodesAndWays();
+        if(!(null != selectedObjects && !selectedObjects.isEmpty()))
+            return null;
+        OsmPrimitive selectedObject = selectedObjects.iterator().next();
         if (selectedObject == null)
             return null;

applications/editors/josm/plugins/CustomizePublicTransportStop/src/org/openstreetmap/josm/plugins/customizepublictransportstop/CustomizePublicTransportStopDialog.java

@@ -8 +8 @@
 import java.awt.GridBagLayout;
 import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
+import java.awt.event.*;
 import java.util.HashMap;
 
@@ -25 +22 @@
 import org.openstreetmap.josm.gui.MainApplication;
 
+
 /**
  * Dialog for setting stop area properties
@@ -30 +28 @@
  * @author Rodion Scherbakov
  */
-public class CustomizePublicTransportStopDialog implements ActionListener, ItemListener {
+public class CustomizePublicTransportStopDialog implements ActionListener, ItemListener, KeyListener {
     private static final String CANCEL_COMMAND = "cancel";
     private static final String SAVE_COMMAND = "save";
@@ -37 +35 @@
     private static final String AREA_CAPTION = "Area";
     private static final String COVER_CAPTION = "Cover";
-    private static final String SHELDER_CAPTION = "Shelder";
+    private static final String SHELTER_CAPTION = "Shelter";
     private static final String BENCH_CAPTION = "Bench";
     private static final String RAILWAY_STOP_CAPTION = "Railway stop";
@@ -80 +78 @@
     private JCheckBox checkBoxIsTrainStop;
     private JCheckBox checkBoxIsBench;
-    private JCheckBox checkBoxIsShelder;
+    private JCheckBox checkBoxIsShelter;
     private JCheckBox checkBoxIsCover;
     private JCheckBox checkBoxIsArea;
@@ -152 +150 @@
         jDialog.pack();
         jDialog.setLocationRelativeTo(frame);
+
+        jDialog.addKeyListener(this);
+        contentPane.addKeyListener(this);
+
     }
 
@@ -165 +167 @@
         layoutCons.fill = GridBagConstraints.HORIZONTAL;
         gridbag.setConstraints(label, layoutCons);
+        label.addKeyListener(this);
         contentPane.add(label);
 
@@ -173 +176 @@
         layoutCons.fill = GridBagConstraints.HORIZONTAL;
         gridbag.setConstraints(textFieldName, layoutCons);
+        textFieldName.addKeyListener(this);
         contentPane.add(textFieldName);
 
@@ -181 +185 @@
         layoutCons.fill = GridBagConstraints.HORIZONTAL;
         gridbag.setConstraints(labelNameEn, layoutCons);
+        labelNameEn.addKeyListener(this);
         contentPane.add(labelNameEn);
 
@@ -189 +194 @@
         layoutCons.fill = GridBagConstraints.HORIZONTAL;
         gridbag.setConstraints(textFieldNameEn, layoutCons);
+        textFieldNameEn.addKeyListener(this);
         contentPane.add(textFieldNameEn);
 
@@ -197 +203 @@
         layoutCons.fill = GridBagConstraints.HORIZONTAL;
         gridbag.setConstraints(labelNetwork, layoutCons);
+        labelNetwork.addKeyListener(this);
         contentPane.add(labelNetwork);
 
@@ -205 +212 @@
         layoutCons.fill = GridBagConstraints.HORIZONTAL;
         gridbag.setConstraints(textFieldNetwork, layoutCons);
+        textFieldNetwork.addKeyListener(this);
         contentPane.add(textFieldNetwork);
 
@@ -213 +221 @@
         layoutCons.fill = GridBagConstraints.HORIZONTAL;
         gridbag.setConstraints(labelOperator, layoutCons);
+        labelOperator.addKeyListener(this);
         contentPane.add(labelOperator);
 
@@ -221 +230 @@
         layoutCons.fill = GridBagConstraints.HORIZONTAL;
         gridbag.setConstraints(textFieldOperator, layoutCons);
+        textFieldOperator.addKeyListener(this);
         contentPane.add(textFieldOperator);
 
@@ -229 +239 @@
         layoutCons.fill = GridBagConstraints.HORIZONTAL;
         gridbag.setConstraints(labelService, layoutCons);
+        labelService.addKeyListener(this);
         contentPane.add(labelService);
 
@@ -242 +253 @@
         layoutCons.fill = GridBagConstraints.HORIZONTAL;
         gridbag.setConstraints(comboBoxService, layoutCons);
+        comboBoxService.addKeyListener(this);
         contentPane.add(comboBoxService);
 
@@ -251 +263 @@
         gridbag.setConstraints(checkBoxIsBus, layoutCons);
         checkBoxIsBus.addItemListener(this);
+        checkBoxIsBus.addKeyListener(this);
         contentPane.add(checkBoxIsBus);
 
@@ -260 +273 @@
         gridbag.setConstraints(checkBoxIsShareTaxi, layoutCons);
         checkBoxIsShareTaxi.addItemListener(this);
+        checkBoxIsShareTaxi.addKeyListener(this);
         contentPane.add(checkBoxIsShareTaxi);
 
@@ -269 +283 @@
         gridbag.setConstraints(checkBoxIsTrolleybus, layoutCons);
         checkBoxIsTrolleybus.addItemListener(this);
+        checkBoxIsTrolleybus.addKeyListener(this);
         contentPane.add(checkBoxIsTrolleybus);
 
@@ -278 +293 @@
         gridbag.setConstraints(checkBoxIsBusStation, layoutCons);
         checkBoxIsBusStation.addItemListener(this);
+        checkBoxIsBusStation.addKeyListener(this);
         contentPane.add(checkBoxIsBusStation);
 
@@ -287 +303 @@
         gridbag.setConstraints(checkBoxIsTram, layoutCons);
         checkBoxIsTram.addItemListener(this);
+        checkBoxIsTram.addKeyListener(this);
         contentPane.add(checkBoxIsTram);
 
@@ -296 +313 @@
         gridbag.setConstraints(checkBoxIsTrainStation, layoutCons);
         checkBoxIsTrainStation.addItemListener(this);
+        checkBoxIsTrainStation.addKeyListener(this);
         contentPane.add(checkBoxIsTrainStation);
 
@@ -305 +323 @@
         gridbag.setConstraints(checkBoxIsTrainStop, layoutCons);
         checkBoxIsTrainStop.addItemListener(this);
+        checkBoxIsTrainStop.addKeyListener(this);
         contentPane.add(checkBoxIsTrainStop);
 
@@ -314 +333 @@
         gridbag.setConstraints(checkBoxIsAssignTransportType, layoutCons);
         checkBoxIsAssignTransportType.addItemListener(this);
+        checkBoxIsAssignTransportType.addKeyListener(this);
         contentPane.add(checkBoxIsAssignTransportType);
 
@@ -323 +343 @@
         gridbag.setConstraints(checkBoxIsBench, layoutCons);
         checkBoxIsBench.addItemListener(this);
+        checkBoxIsBench.addKeyListener(this);
         contentPane.add(checkBoxIsBench);
 
-        checkBoxIsShelder = new JCheckBox(tr(SHELDER_CAPTION));
+        checkBoxIsShelter = new JCheckBox(tr(SHELTER_CAPTION));
         layoutCons.gridx = 1;
         layoutCons.gridy = 10;
         layoutCons.weightx = 0.5;
         layoutCons.fill = GridBagConstraints.HORIZONTAL;
-        gridbag.setConstraints(checkBoxIsShelder, layoutCons);
-        checkBoxIsShelder.addItemListener(this);
-        contentPane.add(checkBoxIsShelder);
+        gridbag.setConstraints(checkBoxIsShelter, layoutCons);
+        checkBoxIsShelter.addItemListener(this);
+        checkBoxIsShelter.addKeyListener(this);
+        contentPane.add(checkBoxIsShelter);
 
         checkBoxIsCover = new JCheckBox(tr(COVER_CAPTION));
@@ -341 +363 @@
         gridbag.setConstraints(checkBoxIsCover, layoutCons);
         checkBoxIsCover.addItemListener(this);
+        checkBoxIsCover.addKeyListener(this);
         contentPane.add(checkBoxIsCover);
 
@@ -350 +373 @@
         gridbag.setConstraints(checkBoxIsArea, layoutCons);
         checkBoxIsArea.addItemListener(this);
+        checkBoxIsArea.addKeyListener(this);
         contentPane.add(checkBoxIsArea);
 
@@ -361 +385 @@
         buttonSave.setActionCommand(SAVE_COMMAND);
         buttonSave.addActionListener(this);
+        buttonSave.addKeyListener(this);
         contentPane.add(buttonSave);
 
@@ -372 +397 @@
         buttonCancel.setActionCommand(CANCEL_COMMAND);
         buttonCancel.addActionListener(this);
+        buttonCancel.addKeyListener(this);
         contentPane.add(buttonCancel);
         return contentPane;
@@ -528 +554 @@
         setCheckBoxValue(checkBoxIsTrainStop, stopArea.isTrainStop);
         setCheckBoxValue(checkBoxIsBench, stopArea.isBench);
-        setCheckBoxValue(checkBoxIsShelder, stopArea.isShelter);
+        setCheckBoxValue(checkBoxIsShelter, stopArea.isShelter);
         setCheckBoxValue(checkBoxIsCover, stopArea.isCovered);
         setCheckBoxValue(checkBoxIsArea, stopArea.isArea);
@@ -573 +599 @@
             stopArea.isTrainStop = getCheckBoxValue(checkBoxIsTrainStop);
             stopArea.isBench = getCheckBoxValue(checkBoxIsBench);
-            stopArea.isShelter = getCheckBoxValue(checkBoxIsShelder);
+            stopArea.isShelter = getCheckBoxValue(checkBoxIsShelter);
             stopArea.isCovered = getCheckBoxValue(checkBoxIsCover);
             stopArea.isArea = getCheckBoxValue(checkBoxIsArea);
@@ -598 +624 @@
     }
 
+    @Override
+    public void keyTyped(KeyEvent e) {
+
+    }
+
+    @Override
+    public void keyPressed(KeyEvent e) {
+        if (e.getKeyChar() == KeyEvent.VK_ESCAPE) {
+            setVisible(false);
+        }
+   }
+
+    @Override
+    public void keyReleased(KeyEvent e) {
+
+    }
 }

applications/editors/josm/plugins/CustomizePublicTransportStop/src/org/openstreetmap/josm/plugins/customizepublictransportstop/CustomizeStopAreaOperation.java

@@ -149 +149 @@
                 "".equals(stopArea.operator) ? null : stopArea.operator);
         commands = assignTag(commands, target, OSMTags.SERVICE_TAG,
-                null == stopArea.service || OSMTags.CITY_NETWORK_TAG_VALUE.equals(stopArea.service) ? null
+                null == stopArea.service || OSMTags.CITY_NETWORK_TAG_VALUE.equals(stopArea.service)
+                        || OSMTags.CITY_NETWORK_TAG_VALUE_OLD.equals(stopArea.service) ? null
                         : stopArea.service);
 

applications/editors/josm/plugins/CustomizePublicTransportStop/src/org/openstreetmap/josm/plugins/customizepublictransportstop/OSMTags.java

@@ -58 +58 @@
     public static final String SERVICE_TAG = "service";
 
-    public static final String CITY_NETWORK_TAG_VALUE = "city";
+    public static final String CITY_NETWORK_TAG_VALUE_OLD = "city";
+    public static final String CITY_NETWORK_TAG_VALUE = "urban";
     public static final String COMMUTER_NETWORK_TAG_VALUE = "commuter";
     public static final String LOCAL_NETWORK_TAG_VALUE = "local";