Index: /trunk/.settings/edu.umd.cs.findbugs.core.prefs =================================================================== --- /trunk/.settings/edu.umd.cs.findbugs.core.prefs (revision 10217) +++ /trunk/.settings/edu.umd.cs.findbugs.core.prefs (revision 10218) @@ -1,4 +1,4 @@ #FindBugs User Preferences -#Sat Aug 01 23:18:50 CEST 2015 +#Sun May 15 18:27:24 CEST 2016 cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true @@ -10,5 +10,5 @@ detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|false +detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true detectorCheckExpectedWarnings=CheckExpectedWarnings|false detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true @@ -19,5 +19,5 @@ detectorConfusedInheritance=ConfusedInheritance|true detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCovariantArrayAssignment=CovariantArrayAssignment|false +detectorCovariantArrayAssignment=CovariantArrayAssignment|true detectorCrossSiteScripting=CrossSiteScripting|true detectorDefaultEncodingDetector=DefaultEncodingDetector|true @@ -81,7 +81,7 @@ detectorIncompatMask=IncompatMask|true detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientIndexOf=InefficientIndexOf|false -detectorInefficientInitializationInsideLoop=InefficientInitializationInsideLoop|false -detectorInefficientMemberAccess=InefficientMemberAccess|false +detectorInefficientIndexOf=InefficientIndexOf|true +detectorInefficientInitializationInsideLoop=InefficientInitializationInsideLoop|true +detectorInefficientMemberAccess=InefficientMemberAccess|true detectorInefficientToArray=InefficientToArray|true detectorInfiniteLoop=InfiniteLoop|true @@ -108,5 +108,5 @@ detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|false +detectorPublicSemaphores=PublicSemaphores|true detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true @@ -131,5 +131,5 @@ detectorUnnecessaryMath=UnnecessaryMath|true detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|false +detectorUselessSubclassMethod=UselessSubclassMethod|true detectorVarArgsProblems=VarArgsProblems|true detectorVolatileUsage=VolatileUsage|true @@ -137,8 +137,8 @@ detectorWrongMapIterator=WrongMapIterator|true detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 +detector_threshold=3 effort=max excludefilter0=tools/findbugs/josm-filter.xml|true -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,EXPERIMENTAL,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|16 +filter_settings=Low|BAD_PRACTICE,CORRECTNESS,EXPERIMENTAL,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|20 filter_settings_neg=NOISE| run_at_full_build=true Index: /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/NameMismatchTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/NameMismatchTest.java (revision 10217) +++ /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/NameMismatchTest.java (revision 10218) @@ -3,5 +3,4 @@ import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; import java.util.List; @@ -38,5 +37,5 @@ public void test0() { final List errors = test("node name:de=Europa"); - assertSame(1, errors.size()); + assertEquals(1, errors.size()); assertEquals("A name is missing, even though name:* exists.", errors.get(0).getMessage()); } @@ -48,5 +47,5 @@ public void test1() { final List errors = test("node name=Europe name:de=Europa"); - assertSame(1, errors.size()); + assertEquals(1, errors.size()); assertEquals("Missing name:*=Europe. Add tag with correct language key.", errors.get(0).getDescription()); } @@ -58,5 +57,5 @@ public void test2() { final List errors = test("node name=Europe name:de=Europa name:en=Europe"); - assertSame(0, errors.size()); + assertEquals(0, errors.size()); } @@ -68,12 +67,12 @@ List errors; errors = test("node \"name\"=\"Italia - Italien - Italy\""); - assertSame(0, errors.size()); + assertEquals(0, errors.size()); errors = test("node name=\"Italia - Italien - Italy\" name:it=Italia"); - assertSame(2, errors.size()); + assertEquals(2, errors.size()); errors = test("node name=\"Italia - Italien - Italy\" name:it=Italia name:de=Italien"); - assertSame(1, errors.size()); + assertEquals(1, errors.size()); assertEquals("Missing name:*=Italy. Add tag with correct language key.", errors.get(0).getDescription()); errors = test("node name=\"Italia - Italien - Italy\" name:it=Italia name:de=Italien name:en=Italy"); - assertSame(0, errors.size()); + assertEquals(0, errors.size()); } } Index: /trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java (revision 10217) +++ /trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java (revision 10218) @@ -3,5 +3,4 @@ import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; import java.io.IOException; @@ -68,11 +67,11 @@ System.out.println("p3: "+DefaultNameFormatter.getInstance().format(p3)+" - "+p3); - assertSame(comparator.compare(p1, p2), -1); // p1 < p2 - assertSame(comparator.compare(p2, p1), 1); // p2 > p1 + assertEquals(comparator.compare(p1, p2), -1); // p1 < p2 + assertEquals(comparator.compare(p2, p1), 1); // p2 > p1 - assertSame(comparator.compare(p1, p3), -1); // p1 < p3 - assertSame(comparator.compare(p3, p1), 1); // p3 > p1 - assertSame(comparator.compare(p2, p3), 1); // p2 > p3 - assertSame(comparator.compare(p3, p2), -1); // p3 < p2 + assertEquals(comparator.compare(p1, p3), -1); // p1 < p3 + assertEquals(comparator.compare(p3, p1), 1); // p3 > p1 + assertEquals(comparator.compare(p2, p3), 1); // p2 > p3 + assertEquals(comparator.compare(p3, p2), -1); // p3 < p2 Relation[] relations = new ArrayList<>(ds.getRelations()).toArray(new Relation[0]); Index: /trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java (revision 10217) +++ /trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java (revision 10218) @@ -4,5 +4,4 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; @@ -69,5 +68,5 @@ for (String file : new String[]{"osm.jos", "osm.joz"}) { List layers = testRead(file); - assertSame(layers.size(), 1); + assertEquals(layers.size(), 1); assertTrue(layers.get(0) instanceof OsmDataLayer); OsmDataLayer osm = (OsmDataLayer) layers.get(0); @@ -85,5 +84,5 @@ for (String file : new String[]{"gpx.jos", "gpx.joz", "nmea.jos"}) { List layers = testRead(file); - assertSame(layers.size(), 1); + assertEquals(layers.size(), 1); assertTrue(layers.get(0) instanceof GpxLayer); GpxLayer gpx = (GpxLayer) layers.get(0); @@ -100,5 +99,5 @@ public void testReadGpxAndMarker() throws IOException, IllegalDataException { List layers = testRead("gpx_markers.joz"); - assertSame(layers.size(), 2); + assertEquals(layers.size(), 2); GpxLayer gpx = null; MarkerLayer marker = null; @@ -124,5 +123,5 @@ public void testReadImage() throws IOException, IllegalDataException { final List layers = testRead("bing.jos"); - assertSame(layers.size(), 1); + assertEquals(layers.size(), 1); assertTrue(layers.get(0) instanceof ImageryLayer); final ImageryLayer image = (ImageryLayer) layers.get(0); @@ -145,5 +144,5 @@ } final List layers = testRead("notes.joz"); - assertSame(layers.size(), 1); + assertEquals(layers.size(), 1); assertTrue(layers.get(0) instanceof NoteLayer); final NoteLayer layer = (NoteLayer) layers.get(0);