Changeset 33195 in osm for applications/editors/josm/plugins/seachart/src/render

Timestamp:

2017-03-24T10:46:53+01:00 (8 years ago)

Author:

malcolmh

Message:

[Seachart] Publish new release

Location:

applications/editors/josm/plugins/seachart/src/render

Files:

• Renderer.java (modified) (1 diff)
• Rules.java (modified) (3 diffs)

applications/editors/josm/plugins/seachart/src/render/Renderer.java

@@ -77 +77 @@
             g2.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_GASP);
             g2.setStroke(new BasicStroke(0, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER));
-            Rules.rules();
+            do {} while (!Rules.rules());
         }
     }

applications/editors/josm/plugins/seachart/src/render/Rules.java

@@ -7 +7 @@
 import java.text.DecimalFormat;
 import java.util.ArrayList;
+import java.util.ConcurrentModificationException;
 import java.util.EnumMap;
 import java.util.HashMap;
@@ -251 +252 @@
     }
 
-    public static void rules() {
+    public static boolean rules() {
         try {
         if ((Renderer.context.ruleset() == RuleSet.ALL) || (Renderer.context.ruleset() == RuleSet.BASE)) {
@@ -347 +348 @@
             if (testObject(Obj.BCNSPP)) for (Feature f : objects) if (testFeature(f)) beacons();
         }
+        } catch (ConcurrentModificationException e) {
+                return false;
         } catch (Exception e) {
-                return; // Just skip this pass
+                return true;
         }
+        return true;
     }