Running this against the current GR-forest repo I get the following changes:
http://cr.openjdk.java.net/~flar/MarlinBlessedModifiers/webrev.0/
I'm not going to push that change as it would disrupt Laurent's current
work in flight. I can also do this after Laurent gets the latest
changes in before integration.
It looks like you can just grep the marlin directory for "final static"
and change them all to "static final" and that will be 99% complete.
The only other change was "static abstract class" should be "abstract
static class" (neither of which sound really pleasant to me anyway).
You can just grep for "abstract" and there are only 2 instances of it
currently in the marlin directory...
...jim
On 10/30/15 7:54 PM, Philip Race wrote:
Yes there is a checked-in tool.
common/bin/blessed-modifier-order.sh
It is not in the JDK repo. It is at top-level (one up from jdk)
-phil.
On 10/30/15, 3:38 PM, Jim Graham wrote:
I just finished synching the repo with the jdk9 master...
There was one conflict. Phil apparently made a pass over all of the
code to do something along the lines of normalizing the modifiers that
all methods are declared with (there is a preferred order for static
vs synchronized vs. public/protected, etc.). The only conflict we had
was AAShapePipe.java so I guess we got lucky. Also, the only changes
in that file were to methods that were deleted/moved to an inner class.
The question (mainly for Phil): is there a tool we should pass over
the Marlin source to make sure that it complies with the standards?
...jim
