Make the Swing code play nice with tools like WindowBuilder.
Merge pull request #1045 from nawroth/desktop

Make the Swing code play nice with tools like WindowBuilder.