notnull and remove unused field

This commit is contained in:
Sergey Ignatov
2014-06-04 16:12:24 +04:00
parent c7cd901904
commit 930235e10b
2 changed files with 4 additions and 9 deletions
@@ -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());
}
@@ -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();