From f9f8c96d19680e519c6b6f889ca04e92d5dd13db Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 23 Jul 2014 18:13:21 +0200 Subject: [PATCH] rename according to name convention --- .../settings/JavaDebuggerSettings.java | 2 +- ...le.java => JavaHotSwapConfigurableUi.java} | 2 +- .../debugger/GroovyDebuggerSettings.java | 2 +- .../debugger/GroovyHotSwapConfigurableUi.form | 45 +++++++++++++++++ .../debugger/GroovyHotSwapConfigurableUi.java | 50 +++++++++++++++++++ 5 files changed, 98 insertions(+), 3 deletions(-) rename java/debugger/impl/src/com/intellij/debugger/settings/{DebuggerHotswapConfigurable.java => JavaHotSwapConfigurableUi.java} (98%) create mode 100644 plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyHotSwapConfigurableUi.form create mode 100644 plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyHotSwapConfigurableUi.java diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/JavaDebuggerSettings.java b/java/debugger/impl/src/com/intellij/debugger/settings/JavaDebuggerSettings.java index 2adecda5a961..2b54742774b3 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/JavaDebuggerSettings.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/JavaDebuggerSettings.java @@ -55,7 +55,7 @@ class JavaDebuggerSettings extends XDebuggerSettings { case STEPPING: return SimpleConfigurable.create("reference.idesettings.debugger.stepping", OptionsBundle.message("options.java.display.name"), DebuggerSteppingConfigurable.class, debuggerSettingsGetter); case HOTSWAP: - return SimpleConfigurable.create("reference.idesettings.debugger.hotswap", OptionsBundle.message("options.java.display.name"), DebuggerHotswapConfigurable.class, debuggerSettingsGetter); + return SimpleConfigurable.create("reference.idesettings.debugger.hotswap", OptionsBundle.message("options.java.display.name"), JavaHotSwapConfigurableUi.class, debuggerSettingsGetter); } return null; } diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerHotswapConfigurable.java b/java/debugger/impl/src/com/intellij/debugger/settings/JavaHotSwapConfigurableUi.java similarity index 98% rename from java/debugger/impl/src/com/intellij/debugger/settings/DebuggerHotswapConfigurable.java rename to java/debugger/impl/src/com/intellij/debugger/settings/JavaHotSwapConfigurableUi.java index 2b70d5f1d5ba..82a33a895fcb 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerHotswapConfigurable.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/JavaHotSwapConfigurableUi.java @@ -23,7 +23,7 @@ import javax.swing.*; import javax.swing.border.Border; import java.awt.*; -class DebuggerHotswapConfigurable implements ConfigurableUi { +class JavaHotSwapConfigurableUi implements ConfigurableUi { private JCheckBox myHotswapInBackground; private JCheckBox myCbCompileBeforeHotswap; private JCheckBox myCbHangWarningEnabled; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyDebuggerSettings.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyDebuggerSettings.java index 1a7f0d6a8f87..07ee3e13d212 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyDebuggerSettings.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyDebuggerSettings.java @@ -54,7 +54,7 @@ public class GroovyDebuggerSettings extends XDebuggerSettings +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyHotSwapConfigurableUi.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyHotSwapConfigurableUi.java new file mode 100644 index 000000000000..400d344bb156 --- /dev/null +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyHotSwapConfigurableUi.java @@ -0,0 +1,50 @@ +/* + * Copyright 2000-2014 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jetbrains.plugins.groovy.debugger; + +import com.intellij.openapi.options.ConfigurableUi; +import org.jetbrains.annotations.NotNull; + +import javax.swing.*; + +/** + * @author ilyas + */ +class GroovyHotSwapConfigurableUi implements ConfigurableUi { + private JPanel myPanel; + private JCheckBox myEnableHotSwap; + + @NotNull + @Override + public JComponent getComponent() { + return myPanel; + } + + @Override + public boolean isModified(@NotNull GroovyDebuggerSettings settings) { + return settings.ENABLE_GROOVY_HOTSWAP != myEnableHotSwap.isSelected(); + } + + @Override + public void apply(@NotNull GroovyDebuggerSettings settings) { + settings.ENABLE_GROOVY_HOTSWAP = myEnableHotSwap.isSelected(); + } + + @Override + public void reset(@NotNull GroovyDebuggerSettings settings) { + myEnableHotSwap.setSelected(settings.ENABLE_GROOVY_HOTSWAP); + } +}