Made innerclasses static where possible
Made inner classes of PartitionGenerateImpl static where possible
Merge pull request #1494 from pveentjer/findbugs

Made innerclasses static where possible