diff --git a/java/java-runtime/anno/com/intellij/uiDesigner/annotations.xml b/java/java-runtime/anno/com/intellij/uiDesigner/annotations.xml
new file mode 100644
index 000000000000..3cf4e00bfead
--- /dev/null
+++ b/java/java-runtime/anno/com/intellij/uiDesigner/annotations.xml
@@ -0,0 +1,6 @@
+<root>
+  <item
+    name='com.intellij.uiDesigner.FormPreviewFrame.MySetLafAction MySetLafAction(javax.swing.JFrame, javax.swing.UIManager.LookAndFeelInfo, java.lang.String) 2'>
+    <annotation name='com.intellij.openapi.util.NlsSafe'/>
+  </item>
+</root>
\ No newline at end of file
diff --git a/java/java-runtime/intellij.java.rt.iml b/java/java-runtime/intellij.java.rt.iml
index 6c292af693e8..b0b395b7d52a 100644
--- a/java/java-runtime/intellij.java.rt.iml
+++ b/java/java-runtime/intellij.java.rt.iml
@@ -2,6 +2,9 @@
 <module relativePaths="true" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
     <exclude-output />
+    <annotation-paths>
+      <root url="file://$MODULE_DIR$/anno" />
+    </annotation-paths>
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
diff --git a/java/java-runtime/src/com/intellij/uiDesigner/FormPreviewFrame.java b/java/java-runtime/src/com/intellij/uiDesigner/FormPreviewFrame.java
index 7955635f3de3..c1b821e38d7b 100644
--- a/java/java-runtime/src/com/intellij/uiDesigner/FormPreviewFrame.java
+++ b/java/java-runtime/src/com/intellij/uiDesigner/FormPreviewFrame.java
@@ -53,6 +53,7 @@ public class FormPreviewFrame {
       super(ourBundle.getString("form.menu.file.exit"));
     }
 
+    @Override
     public void actionPerformed(final ActionEvent e) {
       System.exit(0);
     }
@@ -66,6 +67,7 @@ public class FormPreviewFrame {
       myFrame = frame;
     }
 
+    @Override
     public void actionPerformed(final ActionEvent e) {
       myFrame.pack();
     }
@@ -76,11 +78,16 @@ public class FormPreviewFrame {
     private final UIManager.LookAndFeelInfo myInfo;
 
     MySetLafAction(final JFrame frame, final UIManager.LookAndFeelInfo info) {
-      super(info.getName());
+      this(frame, info, info.getName());
+    }
+
+    MySetLafAction(final JFrame frame, final UIManager.LookAndFeelInfo info, String name) {
+      super(name);
       myFrame = frame;
       myInfo = info;
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
       try{
         UIManager.setLookAndFeel(myInfo.getClassName());