From 6d54c24e9e55109cf702557ca286f39331a30919 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Mon, 6 Mar 2017 17:25:43 +0100 Subject: [PATCH] =?UTF-8?q?cleanup=20=E2=80=94=20default=20impl=20of=20dis?= =?UTF-8?q?poseUIResources?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifacts/ArtifactConfigurableBase.java | 6 +----- .../projectRoot/FacetConfigurable.java | 10 +-------- .../projectRoot/FacetTypeConfigurable.java | 10 +-------- .../options/JavadocOptionsProvider.java | 6 +----- .../ArrangementRuleAliasConfigurable.java | 6 +----- .../startup/ProjectStartupConfigurable.java | 7 +------ .../impl/invalid/InvalidFacetEditor.java | 7 +------ .../DetectionExcludesConfigurable.java | 21 +++++++------------ .../CustomFoldingConfigurable.java | 6 +----- .../libraries/ui/LibraryPropertiesEditor.java | 6 +----- .../ui/DependencyConfigurable.java | 4 ---- .../chrome/ChromeSettingsConfigurable.java | 6 +----- .../firefox/FirefoxSettingsConfigurable.java | 11 +--------- .../openapi/options/Configurable.java | 6 ++++-- .../ExternalDependenciesConfigurable.java | 6 +----- .../RemoteServerConfigurable.java | 6 +----- .../VcsCheckBoxWithSpinnerConfigurable.java | 6 +----- .../copyright/ui/CopyrightConfigurable.java | 13 +++++++++--- .../git4idea/config/GitVcsConfigurable.java | 7 +------ .../settings/GradleRunnerConfigurable.java | 8 ++----- .../compiler/GreclipseConfigurable.java | 6 +----- ...vaFxPreloaderArtifactPropertiesEditor.java | 4 ---- .../python/buildout/BuildoutConfigurable.java | 10 +++------ .../ipnb/configuration/IpnbConfigurable.java | 4 ---- .../PyModuleDependenciesConfigurable.java | 7 +------ .../PyIntegratedToolsConfigurable.java | 6 +----- .../PythonDocumentationConfigurable.java | 7 +------ .../editor/WebEditorOptionsProvider.java | 6 +----- .../javaee/DefaultSchemasConfigurable.java | 6 +----- 29 files changed, 47 insertions(+), 167 deletions(-) diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactConfigurableBase.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactConfigurableBase.java index 5a902e7e6845..bb9eafb1f866 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactConfigurableBase.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactConfigurableBase.java @@ -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() { - } } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetConfigurable.java index 6522dcb62b04..70385f0103b4 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetConfigurable.java @@ -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 { public void apply() throws ConfigurationException { } - @Override - public void reset() { - } - - @Override - public void disposeUIResources() { - } - public void updateComponent() { resetOptionsPanel(); } diff --git a/java/java-impl/src/com/intellij/application/options/JavadocOptionsProvider.java b/java/java-impl/src/com/intellij/application/options/JavadocOptionsProvider.java index b30bb2eae525..175e75f84887 100644 --- a/java/java-impl/src/com/intellij/application/options/JavadocOptionsProvider.java +++ b/java/java-impl/src/com/intellij/application/options/JavadocOptionsProvider.java @@ -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(); } diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/match/tokens/ArrangementRuleAliasConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/match/tokens/ArrangementRuleAliasConfigurable.java index 1f412fbd44eb..4c48f9d62b81 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/match/tokens/ArrangementRuleAliasConfigurable.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/match/tokens/ArrangementRuleAliasConfigurable.java @@ -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() { - } } diff --git a/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupConfigurable.java b/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupConfigurable.java index 6f0b40daf9b5..ebad8e48c1fd 100644 --- a/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupConfigurable.java +++ b/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupConfigurable.java @@ -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(); diff --git a/platform/lang-impl/src/com/intellij/facet/impl/invalid/InvalidFacetEditor.java b/platform/lang-impl/src/com/intellij/facet/impl/invalid/InvalidFacetEditor.java index e1a3c5fd7e42..d5c849f413b0 100644 --- a/platform/lang-impl/src/com/intellij/facet/impl/invalid/InvalidFacetEditor.java +++ b/platform/lang-impl/src/com/intellij/facet/impl/invalid/InvalidFacetEditor.java @@ -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() { } } diff --git a/platform/lang-impl/src/com/intellij/framework/detection/impl/exclude/DetectionExcludesConfigurable.java b/platform/lang-impl/src/com/intellij/framework/detection/impl/exclude/DetectionExcludesConfigurable.java index 3dbceb0a757d..881e60a6026a 100644 --- a/platform/lang-impl/src/com/intellij/framework/detection/impl/exclude/DetectionExcludesConfigurable.java +++ b/platform/lang-impl/src/com/intellij/framework/detection/impl/exclude/DetectionExcludesConfigurable.java @@ -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; - } } diff --git a/platform/lang-impl/src/com/intellij/lang/customFolding/CustomFoldingConfigurable.java b/platform/lang-impl/src/com/intellij/lang/customFolding/CustomFoldingConfigurable.java index 263bc8c93f42..d5b460cd9722 100644 --- a/platform/lang-impl/src/com/intellij/lang/customFolding/CustomFoldingConfigurable.java +++ b/platform/lang-impl/src/com/intellij/lang/customFolding/CustomFoldingConfigurable.java @@ -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() { - } } diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/libraries/ui/LibraryPropertiesEditor.java b/platform/lang-impl/src/com/intellij/openapi/roots/libraries/ui/LibraryPropertiesEditor.java index 97ab9517a01a..54d20940023c 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/libraries/ui/LibraryPropertiesEditor.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/libraries/ui/LibraryPropertiesEditor.java @@ -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() { - } } diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependencyConfigurable.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependencyConfigurable.java index d9d0b1ea907c..c31e9cf857b1 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependencyConfigurable.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependencyConfigurable.java @@ -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 diff --git a/platform/platform-api/src/com/intellij/ide/browsers/chrome/ChromeSettingsConfigurable.java b/platform/platform-api/src/com/intellij/ide/browsers/chrome/ChromeSettingsConfigurable.java index 5cc4167f97d7..12171ad4f383 100644 --- a/platform/platform-api/src/com/intellij/ide/browsers/chrome/ChromeSettingsConfigurable.java +++ b/platform/platform-api/src/com/intellij/ide/browsers/chrome/ChromeSettingsConfigurable.java @@ -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() { diff --git a/platform/platform-api/src/com/intellij/ide/browsers/firefox/FirefoxSettingsConfigurable.java b/platform/platform-api/src/com/intellij/ide/browsers/firefox/FirefoxSettingsConfigurable.java index c28b7e495b41..4224d22f2f23 100644 --- a/platform/platform-api/src/com/intellij/ide/browsers/firefox/FirefoxSettingsConfigurable.java +++ b/platform/platform-api/src/com/intellij/ide/browsers/firefox/FirefoxSettingsConfigurable.java @@ -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; - } } diff --git a/platform/platform-api/src/com/intellij/openapi/options/Configurable.java b/platform/platform-api/src/com/intellij/openapi/options/Configurable.java index e0f0ff4801fe..4c0fd0b8af64 100644 --- a/platform/platform-api/src/com/intellij/openapi/options/Configurable.java +++ b/platform/platform-api/src/com/intellij/openapi/options/Configurable.java @@ -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. diff --git a/platform/platform-impl/src/com/intellij/externalDependencies/impl/ExternalDependenciesConfigurable.java b/platform/platform-impl/src/com/intellij/externalDependencies/impl/ExternalDependenciesConfigurable.java index b2b5fb66f902..3bace7df7946 100644 --- a/platform/platform-impl/src/com/intellij/externalDependencies/impl/ExternalDependenciesConfigurable.java +++ b/platform/platform-impl/src/com/intellij/externalDependencies/impl/ExternalDependenciesConfigurable.java @@ -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() { - } } diff --git a/platform/remote-servers/api/src/com/intellij/remoteServer/RemoteServerConfigurable.java b/platform/remote-servers/api/src/com/intellij/remoteServer/RemoteServerConfigurable.java index 4267d759583a..7834720a3e61 100644 --- a/platform/remote-servers/api/src/com/intellij/remoteServer/RemoteServerConfigurable.java +++ b/platform/remote-servers/api/src/com/intellij/remoteServer/RemoteServerConfigurable.java @@ -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() { - } } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsCheckBoxWithSpinnerConfigurable.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsCheckBoxWithSpinnerConfigurable.java index 810da5367ce5..eaec26e3c475 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsCheckBoxWithSpinnerConfigurable.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsCheckBoxWithSpinnerConfigurable.java @@ -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() { - } } diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightConfigurable.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightConfigurable.java index 32421825ac3e..2fe8a88c190e 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightConfigurable.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightConfigurable.java @@ -74,20 +74,25 @@ public class CopyrightConfigurable extends NamedConfigurable { 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 { 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 { !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 { return regexp; } + @Override public void reset() { myDisplayName = myCopyrightProfile.getName(); SwingUtilities.invokeLater(() -> DocumentUtil.writeInRunUndoTransparentAction( @@ -151,9 +161,6 @@ public class CopyrightConfigurable extends NamedConfigurable { myAllowReplaceTextField.setText(myCopyrightProfile.getAllowReplaceRegexp()); } - public void disposeUIResources() { - } - public void setModified(boolean modified) { myModified = modified; } diff --git a/plugins/git4idea/src/git4idea/config/GitVcsConfigurable.java b/plugins/git4idea/src/git4idea/config/GitVcsConfigurable.java index 78ce67b3ccb0..d2ed04e3934a 100644 --- a/plugins/git4idea/src/git4idea/config/GitVcsConfigurable.java +++ b/plugins/git4idea/src/git4idea/config/GitVcsConfigurable.java @@ -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() { - } - } diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/settings/GradleRunnerConfigurable.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/settings/GradleRunnerConfigurable.java index 15c89cbecd90..7a82d48e34f5 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/settings/GradleRunnerConfigurable.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/settings/GradleRunnerConfigurable.java @@ -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(getItems()); + myPreferredTestRunner = new ComboBox<>(getItems()); } private void enableGradleMake(boolean enable) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GreclipseConfigurable.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GreclipseConfigurable.java index 1227d0aa1cb8..4ef1b4a204e2 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GreclipseConfigurable.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GreclipseConfigurable.java @@ -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() { - } } diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/packaging/preloader/JavaFxPreloaderArtifactPropertiesEditor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/packaging/preloader/JavaFxPreloaderArtifactPropertiesEditor.java index fcb8005690a8..0c2706b066b2 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/packaging/preloader/JavaFxPreloaderArtifactPropertiesEditor.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/packaging/preloader/JavaFxPreloaderArtifactPropertiesEditor.java @@ -76,8 +76,4 @@ public class JavaFxPreloaderArtifactPropertiesEditor extends ArtifactPropertiesE public void reset() { myPreloaderTf.setText(myProperties.getPreloaderClass()); } - - @Override - public void disposeUIResources() { - } } diff --git a/python/ide/src/com/jetbrains/python/buildout/BuildoutConfigurable.java b/python/ide/src/com/jetbrains/python/buildout/BuildoutConfigurable.java index f66137ae77d3..22def8961ca0 100644 --- a/python/ide/src/com/jetbrains/python/buildout/BuildoutConfigurable.java +++ b/python/ide/src/com/jetbrains/python/buildout/BuildoutConfigurable.java @@ -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 paths_from_script = null; + List 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() { - } - } diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConfigurable.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConfigurable.java index 5014f9fbb7ff..8f3d00fc9c95 100644 --- a/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConfigurable.java +++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConfigurable.java @@ -137,10 +137,6 @@ public class IpnbConfigurable implements SearchableConfigurable { setWarningLabelText(); } - @Override - public void disposeUIResources() { - } - @NotNull @Override public String getId() { diff --git a/python/python-community-configure/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.java b/python/python-community-configure/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.java index b4b5544d4e13..22535b560e7e 100644 --- a/python/python-community-configure/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.java +++ b/python/python-community-configure/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.java @@ -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() { - } } diff --git a/python/src/com/jetbrains/python/configuration/PyIntegratedToolsConfigurable.java b/python/src/com/jetbrains/python/configuration/PyIntegratedToolsConfigurable.java index c82dc933c84e..43a9ba216313 100644 --- a/python/src/com/jetbrains/python/configuration/PyIntegratedToolsConfigurable.java +++ b/python/src/com/jetbrains/python/configuration/PyIntegratedToolsConfigurable.java @@ -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() { diff --git a/python/src/com/jetbrains/python/documentation/PythonDocumentationConfigurable.java b/python/src/com/jetbrains/python/documentation/PythonDocumentationConfigurable.java index 050595d9b8ce..bba8334ce036 100644 --- a/python/src/com/jetbrains/python/documentation/PythonDocumentationConfigurable.java +++ b/python/src/com/jetbrains/python/documentation/PythonDocumentationConfigurable.java @@ -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 { @Override public int getColumnCount() { diff --git a/xml/impl/src/com/intellij/application/options/editor/WebEditorOptionsProvider.java b/xml/impl/src/com/intellij/application/options/editor/WebEditorOptionsProvider.java index eb37516af9c7..5811d4c3b9dc 100644 --- a/xml/impl/src/com/intellij/application/options/editor/WebEditorOptionsProvider.java +++ b/xml/impl/src/com/intellij/application/options/editor/WebEditorOptionsProvider.java @@ -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() { diff --git a/xml/impl/src/com/intellij/javaee/DefaultSchemasConfigurable.java b/xml/impl/src/com/intellij/javaee/DefaultSchemasConfigurable.java index 4e783ea1d438..a38af11aef6d 100644 --- a/xml/impl/src/com/intellij/javaee/DefaultSchemasConfigurable.java +++ b/xml/impl/src/com/intellij/javaee/DefaultSchemasConfigurable.java @@ -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() { - } }