|
|
@ -165,15 +165,14 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> { |
|
|
|
columnRowTextField.setText(columnRow.toString()); |
|
|
|
columnRowTextField.setText(columnRow.toString()); |
|
|
|
cellElement = tc.getEditingElementCase().getTemplateCellElement(cs.getColumn(), cs.getRow()); |
|
|
|
cellElement = tc.getEditingElementCase().getTemplateCellElement(cs.getColumn(), cs.getRow()); |
|
|
|
|
|
|
|
|
|
|
|
comboBox.removeActionListener(comboBoxActionListener); |
|
|
|
|
|
|
|
comboBox.removeAllItems(); |
|
|
|
|
|
|
|
JTemplate jTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); |
|
|
|
JTemplate jTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); |
|
|
|
if (jTemplate != null) { |
|
|
|
if (jTemplate != null) { |
|
|
|
|
|
|
|
comboBox.removeActionListener(comboBoxActionListener); |
|
|
|
|
|
|
|
comboBox.removeAllItems(); |
|
|
|
String[] items = getDefaultComboBoxItems(); |
|
|
|
String[] items = getDefaultComboBoxItems(); |
|
|
|
for (String item : items) { |
|
|
|
for (String item : items) { |
|
|
|
comboBox.addItem(item); |
|
|
|
comboBox.addItem(item); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
Object comboBoxSelected = getComboBoxSelected(); |
|
|
|
Object comboBoxSelected = getComboBoxSelected(); |
|
|
|
if (comboBoxSelected != null) { |
|
|
|
if (comboBoxSelected != null) { |
|
|
|
comboBox.setSelectedItem(((ShortCut) comboBoxSelected).getMenuKeySet().getMenuKeySetName()); |
|
|
|
comboBox.setSelectedItem(((ShortCut) comboBoxSelected).getMenuKeySet().getMenuKeySetName()); |
|
|
@ -195,8 +194,8 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> { |
|
|
|
} |
|
|
|
} |
|
|
|
}; |
|
|
|
}; |
|
|
|
comboBox.addActionListener(comboBoxActionListener); |
|
|
|
comboBox.addActionListener(comboBoxActionListener); |
|
|
|
|
|
|
|
} |
|
|
|
refreshDetails(); |
|
|
|
refreshDetails(); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|