Changeset 30859 in osm for applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java

Timestamp:

2014-12-19T17:12:01+01:00 (10 years ago)

Author:

donvip

Message:

[josm_cadastre-fr] replace calls to System.out/err by calls to Main.info/warn/error

File:

• applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java (modified) (23 diffs)

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java

@@ -43 +43 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.ChangeCommand;
@@ -48 +49 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
-import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.Node;
@@ -65 +65 @@
 public class Address extends MapMode implements MouseListener, MouseMotionListener, ActionListener {
     private static final long serialVersionUID = 1L;
-    
+
     // perhaps make all these tags configurable in the future
     private String tagHighway = "highway";
@@ -76 +76 @@
     private String relationAddrStreetRole = "street";
     private String relationMemberHouse = "house";
-    
+
     private JRadioButton plus_one = new JRadioButton("+1", false);
     private JRadioButton plus_two = new JRadioButton("+2", true); // enable this by default
@@ -93 +93 @@
 
     public Address(MapFrame mapFrame) {
-        super(tr("Add address"), "buildings", 
+        super(tr("Add address"), "buildings",
                 tr("Helping tool for tag address"),
                 Shortcut.registerShortcut("mapmode:cadastre-fr-buildings", tr("Mode: {0}", tr("CadastreFR - Buildings")), KeyEvent.VK_E, Shortcut.DIRECT),
@@ -153 +153 @@
                     try {
                         // add new address
-                        Integer.parseInt(num); 
+                        Integer.parseInt(num);
                         inputNumber.setText(num);
                         applyInputNumberChange();
                     } catch (NumberFormatException en) {
-                        System.out.println("Unable to parse house number \"" + num + "\"");
+                        Main.warn("Unable to parse house number \"" + num + "\"");
                     }
                 }
@@ -202 +202 @@
                 setNewSelection(mouseOnExistingWays.get(0));
             } else if (mouseOnExistingWays.size() == 0) {
-                // clicked a non highway and not a node => add the new address 
+                // clicked a non highway and not a node => add the new address
                 if (inputStreet.getText().equals("") || inputNumber.getText().equals("")) {
                     Toolkit.getDefaultToolkit().beep();
@@ -221 +221 @@
 
     }
-    
+
     private Way findWayInRelationAddr(Node n) {
         List<OsmPrimitive> l = n.getReferrers();
@@ -238 +238 @@
         return null;
     }
-    
+
     private void addAddrToPolygon(List<Way> mouseOnExistingBuildingWays, Collection<Command> cmds) {
         for (Way w:mouseOnExistingBuildingWays) {
@@ -244 +244 @@
         }
     }
-    
+
     private void addAddrToPrimitive(OsmPrimitive osm, Collection<Command> cmds) {
         // add the current tag addr:housenumber in node and member in relation (if so configured)
@@ -251 +251 @@
                 revertInputNumberChange();
             } catch (NumberFormatException en) {
-                System.out.println("Unable to parse house number \"" + inputNumber.getText() + "\"");
+                Main.warn("Unable to parse house number \"" + inputNumber.getText() + "\"");
             }
 
@@ -263 +263 @@
             setNewSelection(osm);
         } catch (NumberFormatException en) {
-            System.out.println("Unable to parse house number \"" + inputNumber.getText() + "\"");
-        }
-    }
-    
+                Main.warn("Unable to parse house number \"" + inputNumber.getText() + "\"");
+        }
+    }
+
     private Relation findRelationAddr(Way w) {
         List<OsmPrimitive> l = w.getReferrers();
@@ -276 +276 @@
         return null;
     }
-    
+
     private void addStreetNameOrRelation(OsmPrimitive osm, Collection<Command> cmds) {
         if (Main.pref.getBoolean("cadastrewms.addr.dontUseRelation", false)) {
@@ -339 +339 @@
         return n;
     }
-    
+
     private static void adjustNode(Collection<Pair<Node,Node>> segs, Node n) {
 
@@ -395 +395 @@
         }
     }
-    
+
     static double det(double a, double b, double c, double d) {
         return a * d - b * c;
@@ -422 +422 @@
         return Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR);
     }
-    
+
     private void applyInputNumberChange() {
         Integer num = Integer.parseInt(inputNumber.getText());
@@ -435 +435 @@
         inputNumber.setText(num.toString());
     }
-    
+
     private void revertInputNumberChange() {
         Integer num = Integer.parseInt(inputNumber.getText());
@@ -448 +448 @@
         inputNumber.setText(num.toString());
     }
-    
+
     private void createDialog() {
         ImageIcon iconLink = ImageProvider.get(null, "Mf_relation.png");
@@ -466 +466 @@
         clearButton = new JButton("Clear");
         clearButton.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
+            @Override
+                        public void actionPerformed(ActionEvent e) {
                 inputNumber.setText("");
                 inputStreet.setText("");
@@ -491 +492 @@
         p.add(plus_two, GBC.std().insets(0, 0, 10, 0));
         p.add(clearButton, GBC.eol().fill(GBC.HORIZONTAL).insets(0, 0, 0, 0));
-    
+
         final Object[] options = {};
         final JOptionPane pane = new JOptionPane(p,
@@ -516 +517 @@
                 Main.map.selectMapMode((MapMode)Main.map.getDefaultButtonAction());
             }
-            public void windowClosed(WindowEvent e) {}
-            public void windowActivated(WindowEvent arg0) {}
-            public void windowDeactivated(WindowEvent arg0) {}
-            public void windowDeiconified(WindowEvent arg0) {}
-            public void windowIconified(WindowEvent arg0) {}
-            public void windowOpened(WindowEvent arg0) {}
+            @Override
+                        public void windowClosed(WindowEvent e) {}
+            @Override
+                        public void windowActivated(WindowEvent arg0) {}
+            @Override
+                        public void windowDeactivated(WindowEvent arg0) {}
+            @Override
+                        public void windowDeiconified(WindowEvent arg0) {}
+            @Override
+                        public void windowIconified(WindowEvent arg0) {}
+            @Override
+                        public void windowOpened(WindowEvent arg0) {}
         });
         String bounds = Main.pref.get("cadastrewms.addr.bounds",null);
@@ -530 +537 @@
         }
 }
-    
+
     private void setSelectedWay(Way w) {
         this.selectedWay = w;
@@ -539 +546 @@
         link.repaint();
     }
-    
+
     private void setNewSelection(OsmPrimitive osm) {
         Collection<OsmPrimitive> newSelection = new LinkedList<>(Main.main.getCurrentDataSet().getSelected());