Changeset 32395 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructRouteAction.java

Timestamp:

2016-06-24T09:10:57+02:00 (9 years ago)

Author:

donvip

Message:

checkstyle, update to JOSM 10279

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructRouteAction.java (modified) (17 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructRouteAction.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package relcontext.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.ActionEvent;
@@ -6 +9 @@
 import java.util.List;
 import java.util.Map;
+
 import javax.swing.AbstractAction;
-import static javax.swing.Action.LONG_DESCRIPTION;
-import static javax.swing.Action.SMALL_ICON;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangeCommand;
@@ -21 +24 @@
 import org.openstreetmap.josm.gui.dialogs.relation.sort.RelationSorter;
 import org.openstreetmap.josm.tools.Geometry;
-import static org.openstreetmap.josm.tools.I18n.tr;
 import org.openstreetmap.josm.tools.ImageProvider;
+
 import relcontext.ChosenRelation;
 import relcontext.ChosenRelationListener;
@@ -32 +35 @@
 public class ReconstructRouteAction  extends AbstractAction implements ChosenRelationListener {
     private final ChosenRelation rel;
-    
+
     public ReconstructRouteAction (ChosenRelation rel) {
         super(tr("Reconstruct route"));
@@ -41 +44 @@
         setEnabled(isSuitableRelation(rel.get()));
     }
-    
-    public void actionPerformed( ActionEvent e ) {
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
         Relation r = rel.get();
-        Relation recRel = new Relation(r);        
+        Relation recRel = new Relation(r);
         recRel.removeMembersFor(recRel.getMemberPrimitives());
-        
+
         Map<OsmPrimitive, RelationMember> stopMembers = new LinkedHashMap<>();
         Map<String, List<RelationMember>> platformMembers = new LinkedHashMap<>();
@@ -52 +56 @@
         List<RelationMember> routeMembers = new ArrayList<>();
         List<RelationMember> wtfMembers = new ArrayList<>();
-        
+
         int mCount = r.getMembersCount();
         for (int i = 0; i < mCount; i++) {
@@ -58 +62 @@
             if (PublicTransportHelper.isMemberStop(m)) {
                 RelationMember rm = new RelationMember(
-                        m.hasRole() ? m.getRole() : PublicTransportHelper.STOP, 
-                        m.getMember());
+                        m.hasRole() ? m.getRole() : PublicTransportHelper.STOP,
+                                m.getMember());
                 stopMembers.put(rm.getMember(), rm);
             }
             else if (PublicTransportHelper.isMemberPlatform(m)) {
                 RelationMember rm = new RelationMember(
-                        m.hasRole() ? m.getRole() : PublicTransportHelper.PLATFORM, 
-                        m.getMember());
+                        m.hasRole() ? m.getRole() : PublicTransportHelper.PLATFORM,
+                                m.getMember());
                 String platformName = PublicTransportHelper.getNameViaStoparea(rm);
-                if (platformName == null) platformName = "";
-                if (platformMembers.containsKey(platformName)) platformMembers.get(platformName).add(rm);
-                else {
+                if (platformName == null) {
+                    platformName = "";
+                }
+                if (platformMembers.containsKey(platformName)) {
+                    platformMembers.get(platformName).add(rm);
+                } else {
                     List<RelationMember> nList = new ArrayList<>();
                     nList.add(rm);
                     platformMembers.put(platformName, nList);
-                }                
-            }
-            else if (PublicTransportHelper.isMemberRouteway(m)) routeMembers.add(new RelationMember(m));
-            else wtfMembers.add(new RelationMember(m));
-        }
-        
+                }
+            }
+            else if (PublicTransportHelper.isMemberRouteway(m)) {
+                routeMembers.add(new RelationMember(m));
+            } else {
+                wtfMembers.add(new RelationMember(m));
+            }
+        }
+
         routeMembers = RelationSorter.sortMembersByConnectivity(routeMembers);
-        
+
         Node lastNode = null;
         for (int rIndex = 0; rIndex < routeMembers.size(); rIndex++) {
@@ -91 +101 @@
                         dirForward = true;
                         lastNode = w.lastNode();
-                    } else lastNode = w.firstNode();
+                    } else {
+                        lastNode = w.firstNode();
+                    }
                 } // else one segment - direction unknown
             } else {
-                if (lastNode.equals(w.firstNode())) { dirForward = true; lastNode = w.lastNode(); }
-                else lastNode = w.firstNode();
+                if (lastNode.equals(w.firstNode())) { dirForward = true; lastNode = w.lastNode(); } else {
+                    lastNode = w.firstNode();
+                }
             }
             final int wayNodeBeginIndex = (dirForward ? 0 : w.getNodesCount() - 1);
             final int wayNodeEndIndex = (dirForward ? w.getNodesCount() - 1 : 0);
             final int increment = (dirForward ? 1 : -1);
-            for(int nIndex = wayNodeBeginIndex;
+            for (int nIndex = wayNodeBeginIndex;
                     nIndex != wayNodeEndIndex;
                     nIndex += increment) {
@@ -109 +122 @@
                         stopMembers.remove(refNode);
                         String stopName = PublicTransportHelper.getNameViaStoparea(refNode);
-                        if (stopName == null) stopName = "";
+                        if (stopName == null) {
+                            stopName = "";
+                        }
                         boolean existsPlatform = platformMembers.containsKey(stopName);
                         if (!existsPlatform) { stopName = ""; } // find of the nameless
@@ -118 +133 @@
                                 lMember.remove(0);
                             } else {
-                                // choose closest                                
+                                // choose closest
                                 RelationMember candidat = getClosestPlatform(lMember, refNode);
                                 if (candidat != null) {
@@ -125 +140 @@
                                 }
                             }
-                            if (lMember.isEmpty()) platformMembers.remove(stopName);                            
+                            if (lMember.isEmpty()) {
+                                platformMembers.remove(stopName);
+                            }
                         }
                     }
@@ -131 +148 @@
             }
         }
-        
+
         for (RelationMember stop : stopMembers.values()) {
             recRel.addMember(stop);
@@ -137 +154 @@
             boolean existsPlatform = platformMembers.containsKey(stopName);
             if (!existsPlatform) { stopName = ""; } // find of the nameless
-            if (existsPlatform || platformMembers.containsKey(stopName)) {            
+            if (existsPlatform || platformMembers.containsKey(stopName)) {
                 List<RelationMember> lMember = platformMembers.get(stopName);
                 if (lMember.size() == 1) {
@@ -143 +160 @@
                     lMember.remove(0);
                 } else {
-                    // choose closest                                
+                    // choose closest
                     RelationMember candidat = getClosestPlatform(lMember, stop.getNode());
                     if (candidat != null) {
@@ -150 +167 @@
                     }
                 }
-                if (lMember.isEmpty()) platformMembers.remove(stopName);                            
-            }
-        }
-        
-        for (List<RelationMember> lPlatforms : platformMembers.values())
-            for (RelationMember platform : lPlatforms)
+                if (lMember.isEmpty()) {
+                    platformMembers.remove(stopName);
+                }
+            }
+        }
+
+        for (List<RelationMember> lPlatforms : platformMembers.values()) {
+            for (RelationMember platform : lPlatforms) {
                 recRel.addMember(platform);
-        
-        for (RelationMember route : routeMembers)
+            }
+        }
+
+        for (RelationMember route : routeMembers) {
             recRel.addMember(route);
-        for (RelationMember wtf : wtfMembers)
-            recRel.addMember(wtf);        
+        }
+        for (RelationMember wtf : wtfMembers) {
+            recRel.addMember(wtf);
+        }
         Command command = new ChangeCommand(r, recRel);
         Main.main.undoRedo.add(command);
     }
-    
-    private static final double maxSqrDistBetweenStopAndPlatform = 2000; // ~ 26m    
+
+    private static final double maxSqrDistBetweenStopAndPlatform = 2000; // ~ 26m
     private RelationMember getClosestPlatform(List<RelationMember> members, Node stop) {
         if (stop == null || members.isEmpty()) return null;
@@ -182 +205 @@
                 Way way = member.getWay();
                 EastNorth closest = Geometry.closestPointToSegment(
-                                way.firstNode().getEastNorth(), 
-                                way.lastNode().getEastNorth(), 
-                                stop.getEastNorth()
-                );
+                        way.firstNode().getEastNorth(),
+                        way.lastNode().getEastNorth(),
+                        stop.getEastNorth()
+                        );
                 double sqrDist = stop.getEastNorth().distanceSq(closest);
                 if (sqrDist < maxDist) {
@@ -195 +218 @@
         return result;
     }
- 
-    public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
-        setEnabled(isSuitableRelation(newRelation));
-    }    
-    
+
+    @Override
+    public void chosenRelationChanged(Relation oldRelation, Relation newRelation) {
+        setEnabled(isSuitableRelation(newRelation));
+    }
+
     private boolean isSuitableRelation (Relation newRelation) {
         return !(newRelation == null || !"route".equals(newRelation.get("type")) || newRelation.getMembersCount() == 0);