Changeset 8905 in josm for trunk

Timestamp:

2015-10-19T13:14:06+02:00 (9 years ago)

Author:

Don-vip

Message:

sonar minor fixes

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/PurgeAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/util/GuiHelper.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/NavigatableComponentTest.java (modified) (2 diffs)

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

@@ -181 +181 @@
              */
             List<Relation> relLst = new ArrayList<>(relSet);
-            for (int i = 0; i < relLst.size(); ++i) {
-                for (OsmPrimitive parent : relLst.get(i).getReferrers()) {
+            for (Relation r : relLst) {
+                for (OsmPrimitive parent : r.getReferrers()) {
                     if (!(toPurgeChecked.contains(parent))
                             && hasOnlyIncompleteMembers((Relation) parent, toPurgeChecked, relLst)) {

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java

@@ -51 +51 @@
         Main.debug("Load Thumbnails");
         tracker = new MediaTracker(Main.map.mapView);
-        for (int i = 0; i < data.size(); i++) {
+        for (ImageEntry entry : data) {
             if (stop) return;
 
             // Do not load thumbnails that were loaded before.
-            if (data.get(i).thumbnail == null) {
-                data.get(i).thumbnail = loadThumb(data.get(i));
+            if (entry.thumbnail == null) {
+                entry.thumbnail = loadThumb(entry);
 
                 if (Main.isDisplayingMapView()) {

trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java

@@ -360 +360 @@
             Object key = keys.nextElement();
             Object value = UIManager.get(key);
-            if (value != null && value instanceof FontUIResource) {
+            if (value instanceof FontUIResource) {
                 FontUIResource fui = (FontUIResource) value;
                 UIManager.put(key, new FontUIResource(name, fui.getStyle(), fui.getSize()));

trunk/test/unit/org/openstreetmap/josm/gui/NavigatableComponentTest.java

@@ -35 +35 @@
      */
     @BeforeClass
-    public static void setUp() {
+    public static void setUpBeforeClass() {
         JOSMFixture.createUnitTestFixture().init();
     }
@@ -43 +43 @@
      */
     @Before
-    public void setup() {
+    public void setUp() {
         component = new NavigatableComponent();
         component.setBounds(new Rectangle(WIDTH, HEIGHT));