use constant for history id

This commit is contained in:
Egor.Ushakov
2014-03-07 17:48:57 +04:00
parent 15cb81bc9d
commit 60fa43c29e
4 changed files with 10 additions and 8 deletions
@@ -30,13 +30,14 @@ import javax.swing.*;
* @author egor
*/
public class DefaultConditionComboBoxPanel<B extends XBreakpoint<?>> extends XBreakpointCustomPropertiesPanel<B> {
public static final String HISTORY_KEY = "breakpointCondition";
private XDebuggerExpressionComboBox myConditionComboBox;
public DefaultConditionComboBoxPanel(Project project,
XDebuggerEditorsProvider debuggerEditorsProvider,
String historyId,
XSourcePosition sourcePosition) {
myConditionComboBox = new XDebuggerExpressionComboBox(project, debuggerEditorsProvider, historyId, sourcePosition);
myConditionComboBox = new XDebuggerExpressionComboBox(project, debuggerEditorsProvider, HISTORY_KEY, sourcePosition);
}
@NotNull
@@ -29,13 +29,14 @@ import javax.swing.*;
* @author egor
*/
public class DefaultLogExpressionComboBoxPanel<B extends XBreakpoint<?>> extends XBreakpointCustomPropertiesPanel<B> {
public static final String HISTORY_KEY = "breakpointLogExpression";
private XDebuggerExpressionComboBox myLogExpressionComboBox;
public DefaultLogExpressionComboBoxPanel(Project project,
XDebuggerEditorsProvider debuggerEditorsProvider,
String historyId,
XSourcePosition sourcePosition) {
myLogExpressionComboBox = new XDebuggerExpressionComboBox(project, debuggerEditorsProvider, historyId, sourcePosition);
myLogExpressionComboBox = new XDebuggerExpressionComboBox(project, debuggerEditorsProvider, HISTORY_KEY, sourcePosition);
}
@NotNull
@@ -57,11 +57,11 @@ public class XBreakpointActionsPanel<B extends XBreakpoint<?>> extends XBreakpoi
if (debuggerEditorsProvider instanceof XDebuggerComboBoxProvider) {
logExpressionPanel = ((XDebuggerComboBoxProvider<B>)debuggerEditorsProvider).createLogExpressionComboBoxPanel(
project, debuggerEditorsProvider, "breakpointCondition", myBreakpoint.getSourcePosition());
project, debuggerEditorsProvider, DefaultLogExpressionComboBoxPanel.HISTORY_KEY, myBreakpoint.getSourcePosition());
}
else {
logExpressionPanel =
new DefaultLogExpressionComboBoxPanel<B>(project, debuggerEditorsProvider, "breakpointCondition", myBreakpoint.getSourcePosition());
new DefaultLogExpressionComboBoxPanel<B>(project, debuggerEditorsProvider, myBreakpoint.getSourcePosition());
}
JComponent logExpressionComponent = logExpressionPanel.getComponent();
@@ -107,11 +107,11 @@ public class XLightBreakpointPropertiesPanel<B extends XBreakpoint<?>> implement
final XBreakpointCustomPropertiesPanel<B> conditionPanel;
if (debuggerEditorsProvider instanceof XDebuggerComboBoxProvider) {
conditionPanel = ((XDebuggerComboBoxProvider<B>)debuggerEditorsProvider).createConditionComboBoxPanel(
project, debuggerEditorsProvider, "breakpointCondition", myBreakpoint.getSourcePosition());
project, debuggerEditorsProvider, DefaultConditionComboBoxPanel.HISTORY_KEY, myBreakpoint.getSourcePosition());
}
else {
conditionPanel =
new DefaultConditionComboBoxPanel<B>(project, debuggerEditorsProvider, "breakpointCondition", myBreakpoint.getSourcePosition());
new DefaultConditionComboBoxPanel<B>(project, debuggerEditorsProvider, myBreakpoint.getSourcePosition());
}
myConditionExpressionPanel.add(conditionPanel.getComponent(), BorderLayout.CENTER);
myCustomPanels.add(conditionPanel);