Reorder items in TableForEachSwing

JMRI · Jun 6, 2021 · 94632fd · 94632fd
1 parent ea21e66
commit 94632fd
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 30 deletions.
diff --git a/java/src/jmri/jmrit/logixng/actions/LogLocalVariables.java b/java/src/jmri/jmrit/logixng/actions/LogLocalVariables.java
@@ -48,7 +48,7 @@ public void execute() {
         ConditionalNG c = getConditionalNG();
         log.warn(Bundle.getMessage("LogLocalVariables_Start"));
         for (SymbolTable.Symbol s : c.getSymbolTable().getSymbols().values()) {
-            log.warn(Bundle.getMessage("LogLocalVariables_Variable", s.getName(), c.getSymbolTable().getValue(s.getName())));
+            log.warn("    "+Bundle.getMessage("LogLocalVariables_Variable", s.getName(), c.getSymbolTable().getValue(s.getName())));
         }
         log.warn(Bundle.getMessage("LogLocalVariables_End"));
     }

diff --git a/java/src/jmri/jmrit/logixng/actions/swing/TableForEachSwing.java b/java/src/jmri/jmrit/logixng/actions/swing/TableForEachSwing.java
@@ -20,9 +20,14 @@
  */
 public class TableForEachSwing extends AbstractDigitalActionSwing {
 
+    private JTabbedPane _tabbedPane;
+    private JPanel _panelTable = new javax.swing.JPanel();
+    private JPanel _panelReference = new javax.swing.JPanel();
+    private JPanel _panelFormula = new javax.swing.JPanel();
     private BeanSelectPanel<NamedTable> tableBeanPanel;
     private JComboBox<TableRowOrColumn> _tableRowOrColumnComboBox;
     private JComboBox<String> _rowOrColumnNameComboBox;
+    private JTextField _rowOrColumnNameTextField;
     private JTextField _localVariable;
 
     @Override
@@ -36,6 +41,38 @@ protected void createPanel(@CheckForNull Base object, @Nonnull JPanel buttonPane
         panel = new JPanel();
         panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
 
+        JPanel tableBeanPanelPanel = new JPanel();
+        tableBeanPanelPanel.add(new JLabel(Bundle.getMessage("TableForEachSwing_Table")));
+
+        _tabbedPane = new JTabbedPane();
+        _panelTable = new javax.swing.JPanel();
+        _panelReference = new javax.swing.JPanel();
+        _panelFormula = new javax.swing.JPanel();
+
+        _tabbedPane.addTab("Table", _panelTable); // NOI1aa8N
+        _tabbedPane.addTab("Reference", _panelReference); // NOIaa18N
+        _tabbedPane.addTab("Formula", _panelFormula); // NOI1aa8N
+
+        _tabbedPane.addChangeListener((evt) -> {
+            boolean isPanelTable = (_tabbedPane.getSelectedComponent() == _panelTable);
+            _rowOrColumnNameComboBox.setVisible(isPanelTable);
+            _rowOrColumnNameTextField.setVisible(!isPanelTable);
+        });
+
+        tableBeanPanel = new BeanSelectPanel<>(InstanceManager.getDefault(NamedTableManager.class), null);
+        _panelTable.add(tableBeanPanel);
+
+        JTextField referenceTextField = new JTextField();
+        referenceTextField.setColumns(30);
+        _panelReference.add(referenceTextField);
+
+        JTextField formulaTextField = new JTextField();
+        formulaTextField.setColumns(30);
+        _panelFormula.add(formulaTextField);
+
+        tableBeanPanelPanel.add(_tabbedPane);
+        panel.add(tableBeanPanelPanel);
+
         _tableRowOrColumnComboBox = new JComboBox<>();
         for (TableForEach.TableRowOrColumn item : TableForEach.TableRowOrColumn.values()) {
             _tableRowOrColumnComboBox.addItem(item);
@@ -73,36 +110,13 @@ protected void createPanel(@CheckForNull Base object, @Nonnull JPanel buttonPane
         tableRowOrColumnPanel.add(_tableRowOrColumnComboBox);
         panel.add(tableRowOrColumnPanel);
 
-        JPanel tableBeanPanelPanel = new JPanel();
-        tableBeanPanelPanel.add(new JLabel(Bundle.getMessage("TableForEachSwing_Table")));
-
-        JTabbedPane tabbedPane = new JTabbedPane();
-        JPanel panelTurnout = new javax.swing.JPanel();
-        JPanel panelReference = new javax.swing.JPanel();
-        JPanel panelFormula = new javax.swing.JPanel();
-
-        tabbedPane.addTab("Table", panelTurnout); // NOI1aa8N
-        tabbedPane.addTab("Reference", panelReference); // NOIaa18N
-        tabbedPane.addTab("Formula", panelFormula); // NOI1aa8N
-
-        tableBeanPanel = new BeanSelectPanel<>(InstanceManager.getDefault(NamedTableManager.class), null);
-        panelTurnout.add(tableBeanPanel);
-
-        JTextField referenceTextField = new JTextField();
-        referenceTextField.setColumns(30);
-        panelReference.add(referenceTextField);
-
-        JTextField formulaTextField = new JTextField();
-        formulaTextField.setColumns(30);
-        panelFormula.add(formulaTextField);
-
-        tableBeanPanelPanel.add(tabbedPane);
-        panel.add(tableBeanPanelPanel);
-
         JPanel rowOrColumnNamePanel = new JPanel();
         rowOrColumnNamePanel.add(new JLabel(Bundle.getMessage("TableForEachSwing_RowOrColumnName")));
         _rowOrColumnNameComboBox = new JComboBox<>();
         rowOrColumnNamePanel.add(_rowOrColumnNameComboBox);
+        _rowOrColumnNameTextField = new JTextField(20);
+        _rowOrColumnNameTextField.setVisible(false);
+        rowOrColumnNamePanel.add(_rowOrColumnNameTextField);
         panel.add(rowOrColumnNamePanel);
         JComboBoxUtil.setupComboBoxMaxRows(_rowOrColumnNameComboBox);
 
@@ -154,10 +168,14 @@ public void updateObject(@Nonnull Base object) {
             action.removeTable();
         }
         action.setTableRowOrColumn(_tableRowOrColumnComboBox.getItemAt(_tableRowOrColumnComboBox.getSelectedIndex()));
-        if (_rowOrColumnNameComboBox.getSelectedIndex() != -1) {
-            action.setRowOrColumnName(_rowOrColumnNameComboBox.getItemAt(_rowOrColumnNameComboBox.getSelectedIndex()));
+        if (_tabbedPane.getSelectedComponent() == _panelTable) {
+            if (_rowOrColumnNameComboBox.getSelectedIndex() != -1) {
+                action.setRowOrColumnName(_rowOrColumnNameComboBox.getItemAt(_rowOrColumnNameComboBox.getSelectedIndex()));
+            } else {
+                action.setRowOrColumnName("");
+            }
         } else {
-            action.setRowOrColumnName("");
+            action.setRowOrColumnName(_rowOrColumnNameTextField.getText());
         }
         action.setLocalVariableName(_localVariable.getText());
     }