From 930235e10bc3097ab02c23a13d70e4e04e5b1512 Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Wed, 4 Jun 2014 16:09:58 +0400
Subject: [PATCH] notnull and remove unused field

---
 .../options/codeStyle/CodeStyleMainPanel.java        |  1 -
 .../options/codeStyle/CodeStyleSchemesPanel.java     | 12 ++++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java
index 4db811b4fdb9..3a710fd96277 100644
--- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java
@@ -226,7 +226,6 @@ public class CodeStyleMainPanel extends JPanel implements LanguageSelectorListen
       panel.setModel(myModel);
       mySettingsPanels.put(name, panel);
       mySettingsPanel.add(scheme.getName(), panel);
-      mySchemesPanel.setCodeStyleSettingsPanel(panel);
       panel.setLanguage(myLangSelector.getLanguage());
     }
 
diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java
index 0f3ad0fcf674..b4a2a2476a00 100644
--- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java
@@ -20,6 +20,7 @@ package com.intellij.application.options.codeStyle;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.psi.codeStyle.CodeStyleScheme;
 import com.intellij.ui.ListCellRendererWrapper;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -29,7 +30,7 @@ import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.List;
 
-public class CodeStyleSchemesPanel{
+public class CodeStyleSchemesPanel {
   private JComboBox myCombo;
 
   private final CodeStyleSchemesModel myModel;
@@ -37,7 +38,6 @@ public class CodeStyleSchemesPanel{
   private JButton myManageButton;
 
   private boolean myIsReset = false;
-  private NewCodeStyleSettingsPanel mySettingsPanel;
   private final Font myDefaultComboFont;
   private final Font myBoldComboFont;
 
@@ -48,7 +48,7 @@ public class CodeStyleSchemesPanel{
     myBoldComboFont = myDefaultComboFont.deriveFont(Font.BOLD);
     myCombo.addActionListener(new ActionListener() {
       @Override
-      public void actionPerformed(ActionEvent e) {
+      public void actionPerformed(@NotNull ActionEvent e) {
         if (!myIsReset) {
           ApplicationManager.getApplication().invokeLater(new Runnable() {
                 @Override
@@ -75,7 +75,7 @@ public class CodeStyleSchemesPanel{
     
     myManageButton.addActionListener(new ActionListener() {
       @Override
-      public void actionPerformed(ActionEvent e) {
+      public void actionPerformed(@NotNull ActionEvent e) {
         showManageSchemesDialog();
       }
     });
@@ -148,10 +148,6 @@ public class CodeStyleSchemesPanel{
     return myPanel;
   }
 
-  public void setCodeStyleSettingsPanel(NewCodeStyleSettingsPanel settingsPanel) {
-    mySettingsPanel = settingsPanel;
-  }
-
   private void showManageSchemesDialog() {
     ManageCodeStyleSchemesDialog manageSchemesDialog = new ManageCodeStyleSchemesDialog(myPanel, myModel);
     manageSchemesDialog.show();