[patch] Improve code readability by replacing indexed loops with foreach

[gaben]

There is no code logic change, just readability improvements.

Not all indexed loops replaced, just where it makes the code more compact and readable.

Also found a file with inconsistent formatting (UrlValidatorTest.java​), this also got fixed.

You may want to rename the loop variables in a few places if the ones I provided not good enough :)

[GerdP]

OK for most, but I think NTV2GridShiftFile and ConnectivityRelations are not really improved.

[gaben]

Yeah, these two where I felt the same.

[GerdP]

my proposal for NTV2GridShiftFile

[gaben]

three more readability improvements not related to loops

[gaben]

@GerdP Thanks, much better :)

If anyone commits this, merge my last and GerdP's patch. I could merge it by myself, but don't know what the patch etiquette is, so left it as is.

[stoecker]

Replying to gaben:

@GerdP Thanks, much better :)

If anyone commits this, merge my last and GerdP's patch. I could merge it by myself, but don't know what the patch etiquette is, so left it as is.

Apply it with a note "patch by xxx" or "modified patch by xxx" depending on the fact if you changed something or not. NOTE: Do not use full email addresses in a comment (if only e-mail known the e.g. use only the name part of the mail).

[GerdP]

In 17374/josm:

see #20167: [patch] Improve code readability by replacing indexed loops with foreach
Patch by gaben, slightly modified
I removed the changes for

• GpxImageCorrelation.java, they introduce a TODO
• ConnectivityRelations.java (no improvement in readability)

[gaben]

@stoecker Thanks, I think wiki:DevelopersGuide/PatchGuide needs an update ;)

@GerdP Don't forget committing your improvements of the NTV2GridShiftFile.

[GerdP]

Replying to gaben:

@GerdP Don't forget committing your improvements of the NTV2GridShiftFile.

sonar lint doesn't like them and suggests to merge the loops. I have no idea what this structure contains so I didn't want to replace one issue with another one.

[gaben]

Oh, I see. And how does Sonar felt about my patch? I tried checking, but the browser just stalled. Maybe I need a local instance.

Btw JOSM's Sonar instance is 1 year old, the latest version is 8.5.1, but 8.0 deployed.

[GerdP]

Your patch introduced a checkstyle issue in class UrlValidatorTest (linelength > 145)
Did not see that before committing and I am not sure what to do with that long line

                "http://l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.org"));

If the number of dots is relevant it might be better to compute this test string using the number.

[Klumbumbus]

I guess you can also disable that test for that line similar to https://josm.openstreetmap.de/browser/josm/trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java#L51

[GerdP]

Ah, thanks. Forgot about that

[Klumbumbus]

--> r17381

[GerdP]

see r17384 for ConnectivityRelations