MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-141792 Alternative source available for the class ... should be closable and/or disabled - moved the settings to the general debugger

Browse Source
This commit is contained in:
Egor.Ushakov
2015-11-26 20:35:09 +03:00
parent 93524203ad
commit f7e9660f0d
6 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/debugger/impl/src/com/intellij/debugger/settings/DebuggerDataViewsConfigurable.java
View File

@@ -43,7 +43,6 @@ import java.awt.event.ItemListener;
*/
public class DebuggerDataViewsConfigurable implements SearchableConfigurable {
private JCheckBox myCbAutoscroll;
private JCheckBox myCbShowAlternative;
private JCheckBox myCbShowSyntheticFields;
private StateRestoringCheckBox myCbShowValFieldsAsLocalVariables;
private JCheckBox myCbHideNullArrayElements;
@@ -90,7 +89,6 @@ public class DebuggerDataViewsConfigurable implements SearchableConfigurable {
final JPanel panel = new JPanel(new GridBagLayout());
myCbAutoscroll = new JCheckBox(DebuggerBundle.message("label.base.renderer.configurable.autoscroll"));
myCbShowAlternative = new JCheckBox(DebuggerBundle.message("label.base.renderer.configurable.alternative"));
myCbShowSyntheticFields = new JCheckBox(DebuggerBundle.message("label.base.renderer.configurable.show.synthetic.fields"));
myCbShowValFieldsAsLocalVariables = new StateRestoringCheckBox(DebuggerBundle.message("label.base.renderer.configurable.show.val.fields.as.locals"));
myCbHideNullArrayElements = new JCheckBox(DebuggerBundle.message("label.base.renderer.configurable.hide.null.array.elements"));
@@ -149,7 +147,7 @@ public class DebuggerDataViewsConfigurable implements SearchableConfigurable {
});
panel.add(myCbAutoscroll, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(4, 0, 0, 0), 0, 0));
panel.add(myCbShowAlternative, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(4, 0, 0, 0), 0, 0));
final JPanel showPanel = new JPanel(new GridBagLayout());
showPanel.setBorder(IdeBorderFactory.createTitledBorder("Show", true));
@@ -192,7 +190,6 @@ public class DebuggerDataViewsConfigurable implements SearchableConfigurable {
final NodeRendererSettings rendererSettings = NodeRendererSettings.getInstance();
generalSettings.AUTOSCROLL_TO_NEW_LOCALS = myCbAutoscroll.isSelected();
generalSettings.SHOW_ALTERNATIVE_SOURCE = myCbShowAlternative.isSelected();
rendererSettings.setAlternateCollectionViewsEnabled(myCbEnableAlternateViews.isSelected());
generalSettings.HIDE_NULL_ARRAY_ELEMENTS = myCbHideNullArrayElements.isSelected();
@@ -223,7 +220,6 @@ public class DebuggerDataViewsConfigurable implements SearchableConfigurable {
final NodeRendererSettings rendererSettings = NodeRendererSettings.getInstance();
myCbAutoscroll.setSelected(generalSettings.AUTOSCROLL_TO_NEW_LOCALS);
myCbShowAlternative.setSelected(generalSettings.SHOW_ALTERNATIVE_SOURCE);
myCbHideNullArrayElements.setSelected(generalSettings.HIDE_NULL_ARRAY_ELEMENTS);
myCbEnableAlternateViews.setSelected(rendererSettings.areAlternateCollectionViewsEnabled());
@@ -267,7 +263,6 @@ public class DebuggerDataViewsConfigurable implements SearchableConfigurable {
private boolean areGeneralSettingsModified() {
ViewsGeneralSettings generalSettings = ViewsGeneralSettings.getInstance();
return generalSettings.AUTOSCROLL_TO_NEW_LOCALS != myCbAutoscroll.isSelected() ||
generalSettings.SHOW_ALTERNATIVE_SOURCE != myCbShowAlternative.isSelected() ||
generalSettings.HIDE_NULL_ARRAY_ELEMENTS != myCbHideNullArrayElements.isSelected();
}

7
java/debugger/impl/src/com/intellij/debugger/settings/DebuggerLaunchingConfigurable.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 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,6 +30,7 @@ class DebuggerLaunchingConfigurable implements ConfigurableUi<DebuggerSettings>
private JRadioButton myRbShmem;
private StateRestoringCheckBox myCbForceClassicVM;
private JCheckBox myCbDisableJIT;
private JCheckBox myCbShowAlternativeSource;
@Override
public void reset(@NotNull DebuggerSettings settings) {
@@ -48,6 +49,7 @@ class DebuggerLaunchingConfigurable implements ConfigurableUi<DebuggerSettings>
}
myCbForceClassicVM.setSelected(settings.FORCE_CLASSIC_VM);
myCbDisableJIT.setSelected(settings.DISABLE_JIT);
myCbShowAlternativeSource.setSelected(settings.SHOW_ALTERNATIVE_SOURCE);
}
@Override
@@ -64,6 +66,7 @@ class DebuggerLaunchingConfigurable implements ConfigurableUi<DebuggerSettings>
}
settings.FORCE_CLASSIC_VM = myCbForceClassicVM.isSelectedWhenSelectable();
settings.DISABLE_JIT = myCbDisableJIT.isSelected();
settings.SHOW_ALTERNATIVE_SOURCE = myCbShowAlternativeSource.isSelected();
}
@Override
@@ -78,6 +81,7 @@ class DebuggerLaunchingConfigurable implements ConfigurableUi<DebuggerSettings>
public JComponent getComponent() {
myCbForceClassicVM = new StateRestoringCheckBox(DebuggerBundle.message("label.debugger.launching.configurable.force.classic.vm"));
myCbDisableJIT = new JCheckBox(DebuggerBundle.message("label.debugger.launching.configurable.disable.jit"));
myCbShowAlternativeSource = new JCheckBox(DebuggerBundle.message("label.debugger.general.configurable.show.alternative.source"));
myRbSocket = new JRadioButton(DebuggerBundle.message("label.debugger.launching.configurable.socket"));
myRbShmem = new JRadioButton(DebuggerBundle.message("label.debugger.launching.configurable.shmem"));
@@ -96,6 +100,7 @@ class DebuggerLaunchingConfigurable implements ConfigurableUi<DebuggerSettings>
panel.add(transportPanel);
panel.add(myCbForceClassicVM);
panel.add(myCbDisableJIT);
panel.add(myCbShowAlternativeSource);
JPanel result = new JPanel(new BorderLayout());
result.add(panel, BorderLayout.NORTH);

1
java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSettings.java
View File

@@ -62,6 +62,7 @@ public class DebuggerSettings implements Cloneable, PersistentStateComponent<Ele
public int DEBUGGER_TRANSPORT;
public boolean FORCE_CLASSIC_VM;
public boolean DISABLE_JIT;
public boolean SHOW_ALTERNATIVE_SOURCE = true;
public boolean HOTSWAP_IN_BACKGROUND = true;
public boolean SKIP_SYNTHETIC_METHODS;
public boolean SKIP_CONSTRUCTORS;

4
java/debugger/impl/src/com/intellij/debugger/settings/ViewsGeneralSettings.java
View File

@@ -26,7 +26,6 @@ public class ViewsGeneralSettings implements PersistentStateComponent<ViewsGener
public boolean SHOW_OBJECTID = true;
public boolean HIDE_NULL_ARRAY_ELEMENTS = true;
public boolean AUTOSCROLL_TO_NEW_LOCALS = true;
public boolean SHOW_ALTERNATIVE_SOURCE = true;
public static ViewsGeneralSettings getInstance() {
return ServiceManager.getService(ViewsGeneralSettings.class);
@@ -47,7 +46,6 @@ public class ViewsGeneralSettings implements PersistentStateComponent<ViewsGener
ViewsGeneralSettings generalSettings = ((ViewsGeneralSettings)object);
return SHOW_OBJECTID == generalSettings.SHOW_OBJECTID &&
HIDE_NULL_ARRAY_ELEMENTS == generalSettings.HIDE_NULL_ARRAY_ELEMENTS &&
AUTOSCROLL_TO_NEW_LOCALS == generalSettings.AUTOSCROLL_TO_NEW_LOCALS &&
SHOW_ALTERNATIVE_SOURCE == generalSettings.SHOW_ALTERNATIVE_SOURCE;
AUTOSCROLL_TO_NEW_LOCALS == generalSettings.AUTOSCROLL_TO_NEW_LOCALS;
}
}

6
java/debugger/impl/src/com/intellij/debugger/ui/AlternativeSourceNotificationProvider.java
View File

@@ -17,7 +17,7 @@ package com.intellij.debugger.ui;
import com.intellij.debugger.DebuggerBundle;
import com.intellij.debugger.impl.DebuggerUtilsEx;
import com.intellij.debugger.settings.ViewsGeneralSettings;
import com.intellij.debugger.settings.DebuggerSettings;
import com.intellij.ide.highlighter.JavaClassFileType;
import com.intellij.ide.util.ModuleRendererFactory;
import com.intellij.openapi.fileEditor.FileEditor;
@@ -66,7 +66,7 @@ public class AlternativeSourceNotificationProvider extends EditorNotifications.P
@Nullable
@Override
public EditorNotificationPanel createNotificationPanel(@NotNull VirtualFile file, @NotNull FileEditor fileEditor) {
if (!ViewsGeneralSettings.getInstance().SHOW_ALTERNATIVE_SOURCE) {
if (!DebuggerSettings.getInstance().SHOW_ALTERNATIVE_SOURCE) {
return null;
}
XDebugSession session = XDebuggerManager.getInstance(myProject).getCurrentSession();
@@ -177,7 +177,7 @@ public class AlternativeSourceNotificationProvider extends EditorNotifications.P
createActionLabel(DebuggerBundle.message("action.disable.text"), new Runnable() {
@Override
public void run() {
ViewsGeneralSettings.getInstance().SHOW_ALTERNATIVE_SOURCE = false;
DebuggerSettings.getInstance().SHOW_ALTERNATIVE_SOURCE = false;
FILE_PROCESSED_KEY.set(file, null);
FileEditorManager fileEditorManager = FileEditorManager.getInstance(project);
FileEditor editor = fileEditorManager.getSelectedEditor(file);

2
resources-en/src/messages/DebuggerBundle.properties
View File

@@ -189,7 +189,6 @@ label.array.renderer.configurable.end.index=en&d index:
label.array.renderer.configurable.max.count1=Show &maximum
label.array.renderer.configurable.max.count2=array elements
label.base.renderer.configurable.autoscroll=Autoscroll to new &local variables
label.base.renderer.configurable.alternative=Show alternative source switcher
label.base.renderer.configurable.show.synthetic.fields=S&ynthetic fields
label.base.renderer.configurable.show.val.fields.as.locals=$val fields as local &variables
label.base.renderer.configurable.sort.alphabetically=Sort a&lphabetically
@@ -233,6 +232,7 @@ label.debugger.launching.configurable.disable.jit=Disable JIT
label.debugger.launching.configurable.debugger.transport=Transport:
label.debugger.launching.configurable.socket=&Socket
label.debugger.launching.configurable.shmem=Shared &memory
label.debugger.general.configurable.show.alternative.source=Show alternative source switcher
label.debugger.general.configurable.skip.synthetic.methods=Ski&p synthetic methods
label.debugger.general.configurable.skip.constructors=Skip &constructors
label.debugger.general.configurable.skip.classLoaders=Skip class l&oaders