Changeset 8513 in josm for trunk/test/unit/org/openstreetmap/josm/gui

Timestamp:

2015-06-21T02:25:56+02:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle: blocks

Location:

trunk/test/unit/org/openstreetmap/josm/gui/conflict

Files:

• nodes/NodeListMergeModelTest.java (modified) (3 diffs)
• tags/TagMergeItemTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java

@@ -21 +21 @@
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DatasetFactory;
 import org.openstreetmap.josm.data.osm.Node;
@@ -357 +358 @@
         } catch (IllegalArgumentException e) {
             // OK
+            if (Main.isTraceEnabled()) {
+                Main.trace(e.getMessage());
+            }
         }
 
@@ -364 +368 @@
         } catch (IllegalArgumentException e) {
             // OK
+            if (Main.isTraceEnabled()) {
+                Main.trace(e.getMessage());
+            }
         }
     }

trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java

@@ -9 +9 @@
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
@@ -87 +88 @@
         } catch (IllegalArgumentException e) {
             // OK
+            if (Main.isTraceEnabled()) {
+                Main.trace(e.getMessage());
+            }
         }
     }
@@ -133 +137 @@
         } catch (IllegalStateException e) {
             // OK
+            if (Main.isTraceEnabled()) {
+                Main.trace(e.getMessage());
+            }
         }
     }
@@ -145 +152 @@
         } catch (IllegalArgumentException e) {
             // OK
+            if (Main.isTraceEnabled()) {
+                Main.trace(e.getMessage());
+            }
         }
     }