Changeset 6889 in josm for trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

Timestamp:

2014-02-27T01:41:49+01:00 (10 years ago)

Author:

Don-vip

Message:

fix some Sonar issues (JLS order)

File:

• trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.tools.I18n.trc;
 import static org.openstreetmap.josm.tools.I18n.trn;
 
@@ -258 +257 @@
      * A pair of nodes.
      */
-    static public class NodePair {
+    public static class NodePair {
         private final Node a;
         private final Node b;
@@ -376 +375 @@
     }
 
-    static public class NodeGraph {
-        static public List<NodePair> buildNodePairs(Way way, boolean directed) {
+    public static class NodeGraph {
+        public static List<NodePair> buildNodePairs(Way way, boolean directed) {
             List<NodePair> pairs = new ArrayList<NodePair>();
             for (Pair<Node,Node> pair: way.getNodePairs(false /* don't sort */)) {
@@ -388 +387 @@
         }
 
-        static public List<NodePair> buildNodePairs(List<Way> ways, boolean directed) {
+        public static List<NodePair> buildNodePairs(List<Way> ways, boolean directed) {
             List<NodePair> pairs = new ArrayList<NodePair>();
             for (Way w: ways) {
@@ -396 +395 @@
         }
 
-        static public List<NodePair> eliminateDuplicateNodePairs(List<NodePair> pairs) {
+        public static List<NodePair> eliminateDuplicateNodePairs(List<NodePair> pairs) {
             List<NodePair> cleaned = new ArrayList<NodePair>();
             for(NodePair p: pairs) {
@@ -406 +405 @@
         }
 
-        static public NodeGraph createDirectedGraphFromNodePairs(List<NodePair> pairs) {
+        public static NodeGraph createDirectedGraphFromNodePairs(List<NodePair> pairs) {
             NodeGraph graph = new NodeGraph();
             for (NodePair pair: pairs) {
@@ -414 +413 @@
         }
 
-        static public NodeGraph createDirectedGraphFromWays(Collection<Way> ways) {
+        public static NodeGraph createDirectedGraphFromWays(Collection<Way> ways) {
             NodeGraph graph = new NodeGraph();
             for (Way w: ways) {
@@ -422 +421 @@
         }
 
-        static public NodeGraph createUndirectedGraphFromNodeList(List<NodePair> pairs) {
+        public static NodeGraph createUndirectedGraphFromNodeList(List<NodePair> pairs) {
             NodeGraph graph = new NodeGraph();
             for (NodePair pair: pairs) {