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

Timestamp:

2016-07-04T14:18:17+02:00 (10 years ago)

Author:

donvip

Message:

checkstyle

File:

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

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package cadastre_fr;
 
@@ -113 +114 @@
 //        dialog.setVisible(false);
         // kill the window completely to fix an issue on some linux distro and full screen mode.
-        if(dialog != null) {
+        if (dialog != null) {
             dialog.dispose();
             dialog = null;
@@ -156 +157 @@
                 }
                 if (currentMouseNode.get(tagHouseStreet) != null) {
-                    if(Main.pref.getBoolean("cadastrewms.addr.dontUseRelation", false)) {
+                    if (Main.pref.getBoolean("cadastrewms.addr.dontUseRelation", false)) {
                         inputStreet.setText(currentMouseNode.get(tagHouseStreet));
                         if (ctrl) {
@@ -164 +165 @@
                                 applyInputNumberChange();
                         }
-                        setSelectedWay((Way)null);
+                        setSelectedWay((Way) null);
                     }
                 } else {
@@ -184 +185 @@
         } else {
             List<WaySegment> wss = mv.getNearestWaySegments(mousePos, OsmPrimitive.isSelectablePredicate);
-            for(WaySegment ws : wss) {
+            for (WaySegment ws : wss) {
                 if (ws.way.get(tagHighway) != null && ws.way.get(tagHighwayName) != null)
                     mouseOnExistingWays.add(ws.way);
@@ -220 +221 @@
         for (OsmPrimitive osm : l) {
             if (osm instanceof Relation && osm.hasKey("type") && osm.get("type").equals(relationAddrType)) {
-                for (RelationMember rm : ((Relation)osm).getMembers()) {
+                for (RelationMember rm : ((Relation) osm).getMembers()) {
                     if (rm.getRole().equals(relationAddrStreetRole)) {
                         OsmPrimitive osp = rm.getMember();
                         if (osp instanceof Way && osp.hasKey(tagHighwayName)) {
-                            return (Way)osp;
+                            return (Way) osp;
                         }
                     }
@@ -264 +265 @@
         for (OsmPrimitive osm : l) {
             if (osm instanceof Relation && osm.hasKey("type") && osm.get("type").equals(relationAddrType)) {
-                return (Relation)osm;
+                return (Relation) osm;
             }
         }
@@ -310 +311 @@
             is.add(ws.lowerIndex);
         }
-        Set<Pair<Node,Node>> segSet = new HashSet<>();
+        Set<Pair<Node, Node>> segSet = new HashSet<>();
         ArrayList<Way> replacedWays = new ArrayList<>();
         ArrayList<Way> reuseWays = new ArrayList<>();
@@ -333 +334 @@
     }
 
-    private static void adjustNode(Collection<Pair<Node,Node>> segs, Node n) {
+    private static void adjustNode(Collection<Pair<Node, Node>> segs, Node n) {
 
         switch (segs.size()) {
@@ -341 +342 @@
             // This computes the intersection between
             // the two segments and adjusts the node position.
-            Iterator<Pair<Node,Node>> i = segs.iterator();
-            Pair<Node,Node> seg = i.next();
+            Iterator<Pair<Node, Node>> i = segs.iterator();
+            Pair<Node, Node> seg = i.next();
             EastNorth A = seg.a.getEastNorth();
             EastNorth B = seg.b.getEastNorth();
@@ -349 +350 @@
             EastNorth D = seg.b.getEastNorth();
 
-            double u=det(B.east() - A.east(), B.north() - A.north(), C.east() - D.east(), C.north() - D.north());
+            double u = det(B.east() - A.east(), B.north() - A.north(), C.east() - D.east(), C.north() - D.north());
 
             // Check for parallel segments and do nothing if they are
@@ -366 +367 @@
 
             int snapToIntersectionThreshold
-            = Main.pref.getInteger("edit.snap-intersection-threshold",10);
+            = Main.pref.getInteger("edit.snap-intersection-threshold", 10);
 
             // only adjust to intersection if within snapToIntersectionThreshold pixel of mouse click; otherwise
@@ -462 +463 @@
                 inputNumber.setText("");
                 inputStreet.setText("");
-                setSelectedWay((Way)null);
+                setSelectedWay((Way) null);
             }
         });
@@ -495 +496 @@
                 Main.pref.put("cadastrewms.addr.bounds", dialog.getX()+","+dialog.getY()+","+dialog.getWidth()+","+dialog.getHeight());
             }
+
             @Override public void componentMoved(ComponentEvent e) {
                 rememberGeometry();
             }
+
             @Override public void componentResized(ComponentEvent e) {
                 rememberGeometry();
@@ -506 +509 @@
             public void windowClosing(WindowEvent arg) {
                 exitMode();
-                Main.map.selectMapMode((MapMode)Main.map.getDefaultButtonAction());
+                Main.map.selectMapMode((MapMode) Main.map.getDefaultButtonAction());
             }
         });
-        String bounds = Main.pref.get("cadastrewms.addr.bounds",null);
+        String bounds = Main.pref.get("cadastrewms.addr.bounds", null);
         if (bounds != null) {
             String[] b = bounds.split(",");
             dialog.setBounds(new Rectangle(
-                    Integer.parseInt(b[0]),Integer.parseInt(b[1]),Integer.parseInt(b[2]),Integer.parseInt(b[3])));
+                    Integer.parseInt(b[0]), Integer.parseInt(b[1]), Integer.parseInt(b[2]), Integer.parseInt(b[3])));
         }
     }