Fixed EditorPanel for Java7