For modules using @Messages, it would be very nice to be able to use this annotation also in forms managed by the GUI builder, instead of adding keys directly to Bundle.properties:

- easier to delete, copy, move forms when they are self-contained (no need for special refactoring hook for associated messages)
- no risk of clobbering generated Bundle.properties including annotation-defined values with the static version just because the static version had a newer modification time and no *.java including @Messages did
- diffs show only X.{form,java} after adding/removing/editing form text
- no need to use search to determine which form in a package is using a key

I think a single annotation on initComponents(), probably inside the guarded block, would suffice.

I am not much familiar with this code but could attempt a patch if you think you will not get to it yourself.