Cleanup that adds { } to single blocks mess up with //$NON-NLS-1$

[laeubi]

I perform the cleanup to add missing { } to single blocks but it seems to be confused by //$NON-NLS-1$ tags (or comments in general?)

One example is this org.eclipse.equinox.internal.p2.core.AgentLocation it produces this:

please note that there is a space added before the tab, but there is an additional line break, it should actually be

Another one is org.eclipse.equinox.internal.p2.core.Activator.substituteVar(String, String, String) but it is even working in the same class with adjustTrailingSlash method but completely mess up computeLocationSharedAgent where then even a new warning is produced because the //$NON-NLS-1$ tags are not on the right line anymore.

[laeubi]

@jjohnstn mayn thanks for fixing this I'll try it out once a new I-Build is there!

[laeubi]

Looking more closely on the change... does it really fix the problem? It just seems to add a new testacse ... I'm confused.