diff --git a/java_console/core_ui/src/main/java/com/rusefi/core/ui/AutoupdateUtil.java b/java_console/core_ui/src/main/java/com/rusefi/core/ui/AutoupdateUtil.java index 2c9e0bc451..86161e4de2 100644 --- a/java_console/core_ui/src/main/java/com/rusefi/core/ui/AutoupdateUtil.java +++ b/java_console/core_ui/src/main/java/com/rusefi/core/ui/AutoupdateUtil.java @@ -115,6 +115,12 @@ public class AutoupdateUtil { ); } + @Deprecated // + public static void trueLayout(Component component) { + // todo: inline in Aug of 2025 + trueLayoutAndRepaint(component); + } + public static void trueLayoutAndRepaint(Component component) { assertAwtThread(); if (component == null) diff --git a/java_console/trigger-ui/src/main/java/com/rusefi/trigger/TriggerImage.java b/java_console/trigger-ui/src/main/java/com/rusefi/trigger/TriggerImage.java index 29de672bf3..f27fd23dcf 100644 --- a/java_console/trigger-ui/src/main/java/com/rusefi/trigger/TriggerImage.java +++ b/java_console/trigger-ui/src/main/java/com/rusefi/trigger/TriggerImage.java @@ -132,7 +132,7 @@ public class TriggerImage { f.showFrame(content); f.getFrame().setSize(900, 700); - AutoupdateUtil.trueLayoutAndRepaint(content); + AutoupdateUtil.trueLayout(content); }); SwingUtilities.invokeAndWait(() -> { @@ -162,8 +162,8 @@ public class TriggerImage { topPanel.add(secondWheelControl); } - AutoupdateUtil.trueLayoutAndRepaint(topPanel); - AutoupdateUtil.trueLayoutAndRepaint(content); + AutoupdateUtil.trueLayout(topPanel); + AutoupdateUtil.trueLayout(content); triggerPanel.tdcPosition = triggerWheelInfo.getTdcPosition(); triggerPanel.gaps = triggerWheelInfo.getGaps(); @@ -203,8 +203,8 @@ public class TriggerImage { triggerPanel.name = getTriggerName(triggerWheelInfo); // triggerPanel.id = "#" + triggerWheelInfo.id; - AutoupdateUtil.trueLayoutAndRepaint(triggerPanel); - AutoupdateUtil.trueLayoutAndRepaint(triggerPanel); + AutoupdateUtil.trueLayout(triggerPanel); + AutoupdateUtil.trueLayout(triggerPanel); content.paintImmediately(content.getVisibleRect()); new File(OUTPUT_FOLDER).mkdir(); UiUtils.saveImage(OUTPUT_FOLDER + File.separator + "trigger_" + findByOrdinal(triggerWheelInfo.getId()) + ".png", content); diff --git a/java_console/ui/src/main/java/com/rusefi/SensorSnifferPane.java b/java_console/ui/src/main/java/com/rusefi/SensorSnifferPane.java index 6d471daa9a..38a2429b5c 100644 --- a/java_console/ui/src/main/java/com/rusefi/SensorSnifferPane.java +++ b/java_console/ui/src/main/java/com/rusefi/SensorSnifferPane.java @@ -55,7 +55,7 @@ public class SensorSnifferPane { unpackValues(message, values); if (!paused) { processValues(); - AutoupdateUtil.trueLayoutAndRepaint(canvas); + AutoupdateUtil.trueLayout(canvas); } } }); @@ -70,7 +70,7 @@ public class SensorSnifferPane { @Override public void actionPerformed(ActionEvent e) { clear(); - AutoupdateUtil.trueLayoutAndRepaint(canvas); + AutoupdateUtil.trueLayout(canvas); setPaused(pauseButton, false); } }); diff --git a/java_console/ui/src/main/java/com/rusefi/StartupFrame.java b/java_console/ui/src/main/java/com/rusefi/StartupFrame.java index c98af1dffa..1cc5cf05d6 100644 --- a/java_console/ui/src/main/java/com/rusefi/StartupFrame.java +++ b/java_console/ui/src/main/java/com/rusefi/StartupFrame.java @@ -330,7 +330,7 @@ public class StartupFrame { noPortsMessage.setVisible(ports.isEmpty() || !hasEcuOrBootloader); - AutoupdateUtil.trueLayoutAndRepaint(connectPanel); + AutoupdateUtil.trueLayout(connectPanel); } public static void setFrameIcon(Frame frame) { @@ -398,7 +398,7 @@ public class StartupFrame { comboPorts.setSelectedItem(defaultPort); } - AutoupdateUtil.trueLayoutAndRepaint(comboPorts); + AutoupdateUtil.trueLayout(comboPorts); return hasEcuOrBootloader; } diff --git a/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java b/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java index b5c2c08df8..c13f7fb1dd 100644 --- a/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java +++ b/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java @@ -370,8 +370,8 @@ public class ProgramSelector { } } - AutoupdateUtil.trueLayoutAndRepaint(updateModeComboBox); - AutoupdateUtil.trueLayoutAndRepaint(content); + AutoupdateUtil.trueLayout(updateModeComboBox); + AutoupdateUtil.trueLayout(content); } @NotNull diff --git a/java_console/ui/src/main/java/com/rusefi/ui/InitOnFirstPaintPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/InitOnFirstPaintPanel.java index 55f8e0f733..2aa92398f0 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/InitOnFirstPaintPanel.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/InitOnFirstPaintPanel.java @@ -14,7 +14,7 @@ public abstract class InitOnFirstPaintPanel { if (isFirstPaint) { content.removeAll(); content.add(createContent(), BorderLayout.CENTER); - AutoupdateUtil.trueLayoutAndRepaint(content); + AutoupdateUtil.trueLayout(content); isFirstPaint = false; } super.paint(g); diff --git a/java_console/ui/src/main/java/com/rusefi/ui/LogDownloader.java b/java_console/ui/src/main/java/com/rusefi/ui/LogDownloader.java index 7fe3d23636..27a9d81696 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/LogDownloader.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/LogDownloader.java @@ -61,7 +61,7 @@ public class LogDownloader { JPanel logFileEntry = createFilePanel(message.substring(colonIndex + 1), size); logFiles.add(logFileEntry); - AutoupdateUtil.trueLayoutAndRepaint(logFiles.getParent()); + AutoupdateUtil.trueLayout(logFiles.getParent()); } } }); diff --git a/java_console/ui/src/main/java/com/rusefi/ui/PcanConnectorUI.java b/java_console/ui/src/main/java/com/rusefi/ui/PcanConnectorUI.java index 3bb1606076..d66d880239 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/PcanConnectorUI.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/PcanConnectorUI.java @@ -35,7 +35,7 @@ public class PcanConnectorUI { String stringForTextArea = string; stringForTextArea += "\r\n"; logTextArea.append(stringForTextArea); - AutoupdateUtil.trueLayoutAndRepaint(logTextArea); + AutoupdateUtil.trueLayout(logTextArea); }); new NamedThreadFactory("PCAN-connector").newThread(() -> { diff --git a/java_console/ui/src/main/java/com/rusefi/ui/RecentCommands.java b/java_console/ui/src/main/java/com/rusefi/ui/RecentCommands.java index 1f4bd37cdc..511fa72a02 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/RecentCommands.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/RecentCommands.java @@ -170,7 +170,7 @@ public class RecentCommands { content.add(createButton(uiContext, reentrant, entry.command)); } } - AutoupdateUtil.trueLayoutAndRepaint(content.getParent()); + AutoupdateUtil.trueLayout(content.getParent()); } }); getConfig().getRoot().setProperty(KEY, pack()); diff --git a/java_console/ui/src/main/java/com/rusefi/ui/SensorLiveGraph.java b/java_console/ui/src/main/java/com/rusefi/ui/SensorLiveGraph.java index 947659677b..b0a0a61da5 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/SensorLiveGraph.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/SensorLiveGraph.java @@ -91,7 +91,7 @@ public class SensorLiveGraph extends JPanel { SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - AutoupdateUtil.trueLayoutAndRepaint(SensorLiveGraph.this); + AutoupdateUtil.trueLayout(SensorLiveGraph.this); } }); } diff --git a/java_console/ui/src/main/java/com/rusefi/ui/SizeSelectorPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/SizeSelectorPanel.java index 77c0247776..161a7ff57a 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/SizeSelectorPanel.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/SizeSelectorPanel.java @@ -24,8 +24,8 @@ public class SizeSelectorPanel extends JPanel { Element selected = (Element) e.getSource(); selectedColumn = selected.column; selectedRow = selected.row; - AutoupdateUtil.trueLayoutAndRepaint(SizeSelectorPanel.this); - AutoupdateUtil.trueLayoutAndRepaint(SizeSelectorPanel.this); + AutoupdateUtil.trueLayout(SizeSelectorPanel.this); + AutoupdateUtil.trueLayout(SizeSelectorPanel.this); System.out.println(selectedColumn + " r=" + selectedRow); } diff --git a/java_console/ui/src/main/java/com/rusefi/ui/WarningPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/WarningPanel.java index f92154df21..12dfffbd02 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/WarningPanel.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/WarningPanel.java @@ -23,7 +23,7 @@ public class WarningPanel { @Override public void actionPerformed(ActionEvent e) { label.setVisible(!label.isVisible()); - AutoupdateUtil.trueLayoutAndRepaint(label); + AutoupdateUtil.trueLayout(label); } }); diff --git a/java_console/ui/src/main/java/com/rusefi/ui/console/MainFrame.java b/java_console/ui/src/main/java/com/rusefi/ui/console/MainFrame.java index 92f9bd8965..e56144a2de 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/console/MainFrame.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/console/MainFrame.java @@ -67,7 +67,7 @@ public class MainFrame { ConnectionStatusLogic.INSTANCE.addListener(isConnected -> SwingUtilities.invokeLater(() -> { setTitle(); // this would repaint status label - AutoupdateUtil.trueLayoutAndRepaint(tabbedPane.tabbedPane); + AutoupdateUtil.trueLayout(tabbedPane.tabbedPane); if (ConnectionStatusLogic.INSTANCE.getValue() == ConnectionStatusValue.CONNECTED) { LocalDateTime dateTime = LocalDateTime.now(ZoneOffset.systemDefault()); String isoDateTime = dateTime.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME); diff --git a/java_console/ui/src/main/java/com/rusefi/ui/engine/EngineSnifferPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/engine/EngineSnifferPanel.java index 15463da4c4..46ad20ae7d 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/engine/EngineSnifferPanel.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/engine/EngineSnifferPanel.java @@ -151,7 +151,7 @@ public class EngineSnifferPanel { /** * We have scroll pane size which depends on zoom, that's a long chain of dependencies */ - AutoupdateUtil.trueLayoutAndRepaint(imagePanel.getParent()); + AutoupdateUtil.trueLayout(imagePanel.getParent()); }; resetImagePanel(); @@ -225,7 +225,7 @@ public class EngineSnifferPanel { } // Repaint now that we've updated state - SwingUtilities.invokeLater(() -> AutoupdateUtil.trueLayoutAndRepaint(imagePanel)); + SwingUtilities.invokeLater(() -> AutoupdateUtil.trueLayout(imagePanel)); } public JPanel getPanel() { diff --git a/java_console/ui/src/main/java/com/rusefi/ui/logview/LogViewer.java b/java_console/ui/src/main/java/com/rusefi/ui/logview/LogViewer.java index 457e09bc0e..11ed2bd000 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/logview/LogViewer.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/logview/LogViewer.java @@ -110,7 +110,7 @@ public class LogViewer extends JPanel { descPanel.removeAll(); descPanel.add(new JLabel("Total digital charts: ")); descPanel.add(new JLabel("" + ChartRepository.getInstance().getSize())); - AutoupdateUtil.trueLayoutAndRepaint(descPanel); + AutoupdateUtil.trueLayout(descPanel); } private void openFolder(String folderName) { diff --git a/java_console/ui/src/main/java/com/rusefi/ui/lua/LuaScriptPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/lua/LuaScriptPanel.java index bde372808c..ab22eb783a 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/lua/LuaScriptPanel.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/lua/LuaScriptPanel.java @@ -144,7 +144,7 @@ public class LuaScriptPanel { mainPanel.add(upperPanel, BorderLayout.NORTH); mainPanel.add(centerPanel, BorderLayout.CENTER); - AutoupdateUtil.trueLayoutAndRepaint(mainPanel); + AutoupdateUtil.trueLayout(mainPanel); SwingUtilities.invokeLater(() -> centerPanel.setDividerLocation(centerPanel.getSize().width / 2)); } diff --git a/java_console/ui/src/main/java/com/rusefi/ui/widgets/DetachedSensor.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/DetachedSensor.java index 2a1248696b..5f163f895e 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/widgets/DetachedSensor.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/widgets/DetachedSensor.java @@ -113,7 +113,7 @@ public class DetachedSensor { Component mockComponent = createMockValueSlider(uiContext.getCommandQueue(), sensor); mockControlPanel.add(mockComponent); } - AutoupdateUtil.trueLayoutAndRepaint(content); + AutoupdateUtil.trueLayout(content); int size = width; int h = isMockable ? (int) (size * 1.5) : size; frame.setSize(size, h); diff --git a/java_console/ui/src/main/java/com/rusefi/ui/widgets/SensorGauge.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/SensorGauge.java index 9e0fd4ea88..c77bc96673 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/widgets/SensorGauge.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/widgets/SensorGauge.java @@ -81,7 +81,7 @@ public class SensorGauge { wrapper.removeAllChildrenAndListeners(); wrapper.addMouseListener(mouseListener); wrapper.add(gauge, BorderLayout.CENTER); - AutoupdateUtil.trueLayoutAndRepaint(wrapper.getParent()); + AutoupdateUtil.trueLayout(wrapper.getParent()); } private static void showPopupMenu(UIContext uiContext, MouseEvent e, JPanelWithListener wrapper, GaugeChangeListener listener, diff --git a/java_console/ui/src/main/java/com/rusefi/ui/widgets/StatusPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/StatusPanel.java index c6cd9191a8..16f22f3042 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/widgets/StatusPanel.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/widgets/StatusPanel.java @@ -91,7 +91,7 @@ public class StatusPanel extends JPanel implements UpdateOperationCallbacks { stringForTestArea += "\r\n"; } logTextArea.append(stringForTestArea); - AutoupdateUtil.trueLayoutAndRepaint(logTextArea); + AutoupdateUtil.trueLayout(logTextArea); }); } diff --git a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/LogUploadSelector.java b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/LogUploadSelector.java index c09cce289a..cdc5c30d50 100644 --- a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/LogUploadSelector.java +++ b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/LogUploadSelector.java @@ -64,7 +64,7 @@ public class LogUploadSelector { processFolder(folder); } - AutoupdateUtil.trueLayoutAndRepaint(content); + AutoupdateUtil.trueLayout(content); } private void processFolder(String folder) { diff --git a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/knock/KnockAnalyzerTab.java b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/knock/KnockAnalyzerTab.java index e1a0842249..feb099c51c 100644 --- a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/knock/KnockAnalyzerTab.java +++ b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/knock/KnockAnalyzerTab.java @@ -224,7 +224,7 @@ public class KnockAnalyzerTab { boolean enabled = this.getEnabledEcu(); this.setStartState(enabled); - SwingUtilities.invokeLater(() -> AutoupdateUtil.trueLayoutAndRepaint(content)); + SwingUtilities.invokeLater(() -> AutoupdateUtil.trueLayout(content)); } private void flush() { @@ -238,7 +238,7 @@ public class KnockAnalyzerTab { case CT_ALL: canvases.forEach(canvas -> { canvas.processValues(values); - AutoupdateUtil.trueLayoutAndRepaint(canvas.getComponent()); + AutoupdateUtil.trueLayout(canvas.getComponent()); }); break; case CT_SENSORS: @@ -252,7 +252,7 @@ public class KnockAnalyzerTab { } canvases.forEach(canvas -> { - AutoupdateUtil.trueLayoutAndRepaint(canvas.getComponent()); + AutoupdateUtil.trueLayout(canvas.getComponent()); }); Arrays.fill(values, 0); @@ -300,8 +300,8 @@ public class KnockAnalyzerTab { } public void refreshCanvases() { - SwingUtilities.invokeLater(() -> AutoupdateUtil.trueLayoutAndRepaint(canvasesComponent)); - SwingUtilities.invokeLater(() -> AutoupdateUtil.trueLayoutAndRepaint(content)); + SwingUtilities.invokeLater(() -> AutoupdateUtil.trueLayout(canvasesComponent)); + SwingUtilities.invokeLater(() -> AutoupdateUtil.trueLayout(content)); } public void createCanvas(int number, int divider) { diff --git a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/knock/KnockCanvas.java b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/knock/KnockCanvas.java index 8c430714e5..4ba99e11cc 100644 --- a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/knock/KnockCanvas.java +++ b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/knock/KnockCanvas.java @@ -138,7 +138,7 @@ public class KnockCanvas { public KnockCanvas(int number, int divider) { - SwingUtilities.invokeLater(() -> AutoupdateUtil.trueLayoutAndRepaint(component)); + SwingUtilities.invokeLater(() -> AutoupdateUtil.trueLayout(component)); this.number = number; SPECTROGRAM_X_AXIS_SIZE = SPECTROGRAM_X_AXIS_SIZE_BASE / divider; diff --git a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/knock/KnockMagnitudeCanvas.java b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/knock/KnockMagnitudeCanvas.java index 4333f89d7f..cd1b53fec1 100644 --- a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/knock/KnockMagnitudeCanvas.java +++ b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/knock/KnockMagnitudeCanvas.java @@ -59,7 +59,7 @@ public class KnockMagnitudeCanvas { public KnockMagnitudeCanvas() { SwingUtilities.invokeLater(() -> { - AutoupdateUtil.trueLayoutAndRepaint(component); + AutoupdateUtil.trueLayout(component); }); bufferedImage = new BufferedImage(640, 480, BufferedImage.TYPE_INT_RGB); @@ -178,7 +178,7 @@ public class KnockMagnitudeCanvas { } bufferedGraphics.setFont(defaultFont); - AutoupdateUtil.trueLayoutAndRepaint(component); + AutoupdateUtil.trueLayout(component); } } diff --git a/java_tools/ts_plugin_launcher/src/main/java/com/rusefi/ts_plugin/Updater.java b/java_tools/ts_plugin_launcher/src/main/java/com/rusefi/ts_plugin/Updater.java index 8374c7a931..813f48d4cd 100644 --- a/java_tools/ts_plugin_launcher/src/main/java/com/rusefi/ts_plugin/Updater.java +++ b/java_tools/ts_plugin_launcher/src/main/java/com/rusefi/ts_plugin/Updater.java @@ -216,7 +216,7 @@ public class Updater { private void replaceWith(TsPluginBody instance) { content.removeAll(); content.add(instance.getContent()); - AutoupdateUtil.trueLayoutAndRepaint(content.getParent()); + AutoupdateUtil.trueLayout(content.getParent()); Window windowAncestor = SwingUtilities.getWindowAncestor(content); AutoupdateUtil.pack(windowAncestor); }