cleanup — default impl of disposeUIResources

This commit is contained in:
Vladimir Krivosheev
2017-03-06 17:25:43 +01:00
parent 0ecc4bf49a
commit 6d54c24e9e
29 changed files with 47 additions and 167 deletions
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2010 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -70,8 +70,4 @@ public abstract class ArtifactConfigurableBase extends ProjectStructureElementCo
public Icon getIcon(boolean open) {
return getArtifact().getArtifactType().getIcon();
}
@Override
public void disposeUIResources() {
}
}
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -113,12 +113,4 @@ public class FacetConfigurable extends ProjectStructureElementConfigurable<Facet
@Override
public void apply() throws ConfigurationException {
}
@Override
public void reset() {
}
@Override
public void disposeUIResources() {
}
}
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -74,14 +74,6 @@ public class FacetTypeConfigurable extends NamedConfigurable<FacetType> {
public void apply() throws ConfigurationException {
}
@Override
public void reset() {
}
@Override
public void disposeUIResources() {
}
public void updateComponent() {
resetOptionsPanel();
}
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -71,10 +71,6 @@ public class JavadocOptionsProvider implements EditorOptionsProvider {
myAutoGenerateClosingTagCheckBox.setSelected(getSettings().JAVADOC_GENERATE_CLOSING_TAG);
}
@Override
public void disposeUIResources() {
}
private static CodeInsightSettings getSettings() {
return CodeInsightSettings.getInstance();
}
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -63,8 +63,4 @@ public class ArrangementRuleAliasConfigurable implements UnnamedConfigurable {
public void reset() {
myTokenRulesPanel.setRuleSequences(myToken.getDefinitionRules());
}
@Override
public void disposeUIResources() {
}
}
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -48,7 +48,6 @@ import com.intellij.ui.awt.RelativePoint;
import com.intellij.ui.components.JBCheckBox;
import com.intellij.ui.components.JBList;
import com.intellij.ui.table.JBTable;
import com.intellij.util.Consumer;
import com.intellij.util.IconUtil;
import com.intellij.util.Processor;
import com.intellij.util.containers.ContainerUtil;
@@ -369,10 +368,6 @@ public class ProjectStartupConfigurable implements SearchableConfigurable, Confi
refreshDataUpdateSelection(null);
}
@Override
public void disposeUIResources() {
}
private void installRenderers() {
final TableColumn checkboxColumn = myTable.getColumnModel().getColumn(ProjectStartupTasksTableModel.IS_SHARED_COLUMN);
final String header = checkboxColumn.getHeaderValue().toString();
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2010 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -73,10 +73,5 @@ public class InvalidFacetEditor extends FacetEditorTab {
@Override
public void apply() {
myInvalidFacetManager.setIgnored(myFacet, myIgnoreCheckBox.isSelected());
}
@Override
public void disposeUIResources() {
}
}
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ import com.intellij.openapi.ui.popup.ListPopup;
import com.intellij.openapi.ui.popup.PopupStep;
import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.ui.*;
@@ -45,7 +45,9 @@ import javax.swing.border.EmptyBorder;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
/**
@@ -203,10 +205,10 @@ public class DetectionExcludesConfigurable implements Configurable {
}
}
else if (itemFile != null) {
if (VfsUtil.isAncestor(file, itemFile, false) && (frameworkType == null || frameworkType.getId().equals(itemTypeId))) {
if (VfsUtilCore.isAncestor(file, itemFile, false) && (frameworkType == null || frameworkType.getId().equals(itemTypeId))) {
iterator.remove();
}
if (VfsUtil.isAncestor(itemFile, file, false) && (itemTypeId == null || frameworkType != null && itemTypeId.equals(frameworkType.getId()))) {
if (VfsUtilCore.isAncestor(itemFile, file, false) && (itemTypeId == null || frameworkType != null && itemTypeId.equals(frameworkType.getId()))) {
add = false;
}
}
@@ -275,18 +277,9 @@ public class DetectionExcludesConfigurable implements Configurable {
}
}
@Override
public void disposeUIResources() {
}
@Nls
@Override
public String getDisplayName() {
return "Framework Detection Excludes";
}
@Override
public String getHelpTopic() {
return null;
}
}
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -81,8 +81,4 @@ public class CustomFoldingConfigurable implements SearchableConfigurable {
mySettingsPanel.setEnabled(myConfiguration.getState().isEnabled());
mySettingsPanel.setCollapsedStatePattern(myConfiguration.getState().getDefaultCollapsedStatePattern());
}
@Override
public void disposeUIResources() {
}
}
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2010 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -30,8 +30,4 @@ public abstract class LibraryPropertiesEditor implements UnnamedConfigurable {
@Override
public abstract void apply();
@Override
public void disposeUIResources() {
}
}
@@ -170,10 +170,6 @@ public class DependencyConfigurable extends BaseConfigurable {
return !Arrays.asList(validationManager.getAllRules()).equals(rules);
}
@Override
public void disposeUIResources() {
}
private static final DefaultTableCellRenderer
CELL_RENDERER = new DefaultTableCellRenderer() {
@Override
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -119,10 +119,6 @@ public class ChromeSettingsConfigurable implements Configurable {
}
}
@Override
public void disposeUIResources() {
}
@Nls
@Override
public String getDisplayName() {
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -131,18 +131,9 @@ public class FirefoxSettingsConfigurable implements Configurable {
myLastProfilesIniPath = profilesIniPath;
}
@Override
public void disposeUIResources() {
}
@Override
@Nls
public String getDisplayName() {
return IdeBundle.message("display.name.firefox.settings");
}
@Override
public String getHelpTopic() {
return null;
}
}
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -155,7 +155,9 @@ public interface Configurable extends UnnamedConfigurable {
*/
@Nullable
@NonNls
String getHelpTopic();
default String getHelpTopic() {
return null;
}
/**
* This interface represents a configurable component that has child components.
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -241,8 +241,4 @@ public class ExternalDependenciesConfigurable implements SearchableConfigurable,
public String getHelpTopic() {
return "Required_Plugin";
}
@Override
public void disposeUIResources() {
}
}
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29,8 +29,4 @@ public abstract class RemoteServerConfigurable implements UnnamedConfigurable {
public boolean canCheckConnection() {
return true;
}
@Override
public void disposeUIResources() {
}
}
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -71,8 +71,4 @@ public abstract class VcsCheckBoxWithSpinnerConfigurable implements Configurable
}
protected abstract SpinnerNumberModel createSpinnerModel();
@Override
public void disposeUIResources() {
}
}
@@ -74,20 +74,25 @@ public class CopyrightConfigurable extends NamedConfigurable<CopyrightProfile> {
myEditorPanel.add(myEditor.getComponent(), BorderLayout.CENTER);
}
@Override
public void setDisplayName(String s) {
myCopyrightProfile.setName(s);
}
@Override
public CopyrightProfile getEditableObject() {
return myCopyrightProfile;
}
@Override
public String getBannerSlogan() {
return myCopyrightProfile.getName();
}
@Override
public JComponent createOptionsPanel() {
myValidateButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
try {
VelocityHelper.verify(myEditor.getDocument().getText());
@@ -101,17 +106,20 @@ public class CopyrightConfigurable extends NamedConfigurable<CopyrightProfile> {
return myWholePanel;
}
@Override
@Nls
public String getDisplayName() {
return myCopyrightProfile.getName();
}
@Override
@Nullable
@NonNls
public String getHelpTopic() {
return null;
}
@Override
public boolean isModified() {
return myModified ||
!Comparing.strEqual(EntityUtil.encode(myEditor.getDocument().getText()), myCopyrightProfile.getNotice()) ||
@@ -120,6 +128,7 @@ public class CopyrightConfigurable extends NamedConfigurable<CopyrightProfile> {
!Comparing.strEqual(myDisplayName, myCopyrightProfile.getName());
}
@Override
public void apply() throws ConfigurationException {
myCopyrightProfile.setNotice(EntityUtil.encode(myEditor.getDocument().getText()));
myCopyrightProfile.setKeyword(validateRegexpAndGet(myKeywordTf.getText().trim(), "Detect copyright regexp is incorrect: "));
@@ -143,6 +152,7 @@ public class CopyrightConfigurable extends NamedConfigurable<CopyrightProfile> {
return regexp;
}
@Override
public void reset() {
myDisplayName = myCopyrightProfile.getName();
SwingUtilities.invokeLater(() -> DocumentUtil.writeInRunUndoTransparentAction(
@@ -151,9 +161,6 @@ public class CopyrightConfigurable extends NamedConfigurable<CopyrightProfile> {
myAllowReplaceTextField.setText(myCopyrightProfile.getAllowReplaceRegexp());
}
public void disposeUIResources() {
}
public void setModified(boolean modified) {
myModified = modified;
}
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -73,9 +73,4 @@ public class GitVcsConfigurable implements Configurable {
public void reset() {
panel.load(mySettings, mySharedSettings);
}
@Override
public void disposeUIResources() {
}
}
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -87,14 +87,10 @@ public class GradleRunnerConfigurable extends BaseConfigurable {
return !settings.equals(uiSettings);
}
@Override
public void disposeUIResources() {
}
private void createUIComponents() {
myGradleAwareMakeCheckBox = new JBCheckBox(GradleBundle.message("gradle.settings.text.use.gradle.aware.make"));
myGradleAwareMakeCheckBox.addActionListener(e -> enableGradleMake(myGradleAwareMakeCheckBox.isSelected()));
myPreferredTestRunner = new ComboBox<TestRunnerItem>(getItems());
myPreferredTestRunner = new ComboBox<>(getItems());
}
private void enableGradleMake(boolean enable) {
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -90,8 +90,4 @@ public class GreclipseConfigurable implements Configurable {
myCmdLineParams.setText(mySettings.cmdLineParams);
myGenerateDebugInfo.setSelected(mySettings.debugInfo);
}
@Override
public void disposeUIResources() {
}
}
@@ -76,8 +76,4 @@ public class JavaFxPreloaderArtifactPropertiesEditor extends ArtifactPropertiesE
public void reset() {
myPreloaderTf.setText(myProperties.getPreloaderClass());
}
@Override
public void disposeUIResources() {
}
}
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -61,6 +61,7 @@ public class BuildoutConfigurable implements Configurable, NonDefaultProjectConf
myEnabledCheckbox.setSelected(isEnabled);
updateFacetEnabled(isEnabled);
myEnabledCheckbox.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
final boolean enabled = myEnabledCheckbox.isSelected();
updateFacetEnabled(enabled);
@@ -120,7 +121,7 @@ public class BuildoutConfigurable implements Configurable, NonDefaultProjectConf
boolean facet_is_desired = myEnabledCheckbox.isSelected();
mySettingsPanel.apply();
List<String> paths_from_script = null;
List<String> paths_from_script;
if (facet_is_desired) {
String script_name = mySettingsPanel.getScriptName();
VirtualFile script_file = BuildoutConfigPanel.getScriptFile(script_name);
@@ -174,9 +175,4 @@ public class BuildoutConfigurable implements Configurable, NonDefaultProjectConf
private void switchNoticeText() {
mySettingsPanel.showNoticeText(/*DjangoFacet.getInstance(myModule) != null*/ false);
}
@Override
public void disposeUIResources() {
}
}
@@ -137,10 +137,6 @@ public class IpnbConfigurable implements SearchableConfigurable {
setWarningLabelText();
}
@Override
public void disposeUIResources() {
}
@NotNull
@Override
public String getId() {
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@ import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.roots.OrderEntry;
import com.intellij.ui.CheckBoxList;
import com.intellij.ui.ToolbarDecorator;
import com.intellij.util.Function;
import com.intellij.util.ui.EditableListModelDecorator;
import org.jetbrains.annotations.Nullable;
@@ -118,8 +117,4 @@ public class PyModuleDependenciesConfigurable implements UnnamedConfigurable {
public void reset() {
resetModel();
}
@Override
public void disposeUIResources() {
}
}
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -285,10 +285,6 @@ public class PyIntegratedToolsConfigurable implements SearchableConfigurable {
myRequirementsPathField.setText(getRequirementsPath());
}
@Override
public void disposeUIResources() {
}
@NotNull
@Override
public String getId() {
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -30,7 +30,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import java.util.ArrayList;
import java.util.HashSet;
@@ -81,10 +80,6 @@ public class PythonDocumentationConfigurable implements SearchableConfigurable,
PythonDocumentationMap.getInstance().setEntries(myPanel.getData());
}
@Override
public void disposeUIResources() {
}
private static class PythonDocumentationTableModel extends AddEditRemovePanel.TableModel<PythonDocumentationMap.Entry> {
@Override
public int getColumnCount() {
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -90,10 +90,6 @@ public class WebEditorOptionsProvider implements EditorOptionsProvider {
mySyncTagEditing.setSelected(xmlEditorOptions.isSyncTagEditing());
}
@Override
public void disposeUIResources() {
}
@Override
@NotNull
public String getId() {
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2010 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -139,8 +139,4 @@ public class DefaultSchemasConfigurable implements Configurable {
myXMLSchema11JBRadioButton.setSelected(true);
}
}
@Override
public void disposeUIResources() {
}
}