Changeset 12287 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-06-01T00:02:26+02:00 (7 years ago)

Author:

Don-vip

Message:

see #11166 - make SimplifyWayAction.simplifyWay static + fix javadoc

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• SimplifyWayAction.java (modified) (3 diffs)
• SplitWayAction.java (modified) (3 diffs)

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

@@ -137 +137 @@
      * in order to simplify the way.
      */
-    protected boolean isRequiredNode(Way way, Node node) {
+    protected static boolean isRequiredNode(Way way, Node node) {
         int frequency = Collections.frequency(way.getNodes(), node);
         if ((way.getNode(0) == node) && (way.getNode(way.getNodesCount()-1) == node)) {
@@ -174 +174 @@
      * @since 6411
      */
-    public SequenceCommand simplifyWay(Way w, double threshold) {
+    public static SequenceCommand simplifyWay(Way w, double threshold) {
         int lower = 0;
         int i = 0;
@@ -234 +234 @@
      * @param simplifiedNodes list that will contain resulting nodes
      */
-    protected void buildSimplifiedNodeList(List<Node> wnew, int from, int to, double threshold, List<Node> simplifiedNodes) {
+    protected static void buildSimplifiedNodeList(List<Node> wnew, int from, int to, double threshold, List<Node> simplifiedNodes) {
 
         Node fromN = wnew.get(from);

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

@@ -491 +491 @@
      * i.e. {@code Main.main.undoredo.add(result.getCommand())}.
      *
-     * @param layer the layer which the way belongs to. Must not be null.
+     * @param layer the layer which the way belongs to.
      * @param way the way to split. Must not be null.
      * @param wayChunks the list of way chunks into the way is split. Must not be null.
@@ -512 +512 @@
      * i.e. {@code Main.main.undoredo.add(result.getCommand())}.
      *
-     * @param layer the layer which the way belongs to. Must not be null.
+     * @param layer the layer which the way belongs to.
      * @param way the way to split. Must not be null.
      * @param wayChunks the list of way chunks into the way is split. Must not be null.
@@ -733 +733 @@
      * Replies null if the way couldn't be split at the given nodes.
      *
-     * @param layer the layer which the way belongs to. Must not be null.
+     * @param layer the layer which the way belongs to.
      * @param way the way to split. Must not be null.
      * @param atNodes the list of nodes where the way is split. Must not be null.