diff --git a/.gitignore b/.gitignore index 0a478ffa8..1f2bafddf 100644 --- a/.gitignore +++ b/.gitignore @@ -2,9 +2,6 @@ *.hex *.jar -# Created by https://www.gitignore.io/api/gradle,eclipse,netbeans,intellij+iml -# Edit at https://www.gitignore.io/?templates=gradle,eclipse,netbeans,intellij+iml - ### Eclipse ### .metadata bin/ @@ -140,4 +137,14 @@ gradle-app.setting ### Gradle Patch ### **/build/ -# End of https://www.gitignore.io/api/gradle,eclipse,netbeans,intellij+iml +### VS Code ### +.vscode/ +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace +.metals/ + +# Local History for Visual Studio Code +.history/ diff --git a/application/build.gradle b/application/build.gradle index 996a29406..e952dacc5 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens @@ -31,6 +31,10 @@ dependencies { extraLibs libs.logback extraLibs libs.slf4JApi extraLibs libs.migLayout + extraLibs libs.flatLaf + extraLibs(libs.flatLafExtras) { + exclude group: 'com.formdev', module: 'flatlaf' + } providedRuntime project(":plugins:compiler:as-8080") providedRuntime project(":plugins:compiler:as-ssem") @@ -68,7 +72,6 @@ dependencies { testImplementation libs.slf4JSimple } - application { applicationName = 'emuStudio' mainClassName = 'net.emustudio.application.cmdline.Runner' @@ -154,6 +157,18 @@ startScripts { def unixScriptFile = file getUnixScript() windowsScriptFile.text = windowsScriptFile.text.replace('%APP_HOME%\\lib\\logback.xml', '.') unixScriptFile.text = unixScriptFile.text.replace('$APP_HOME/lib/logback.xml', '.') + + // --- NEW: Wayland/Sway fix for AWT (XWayland) --- + def unixText = unixScriptFile.text + if (!unixText.contains('_JAVA_AWT_WM_NONREPARENTING')) { + unixText = unixText.replaceFirst( + /(?m)^#!.*$/, + '#!/usr/bin/env sh\n\n' + + '# Workaround for Swing/AWT resizing under Sway/Wayland (XWayland)\n' + + 'export _JAVA_AWT_WM_NONREPARENTING=1\n' + ) + unixScriptFile.text = unixText + } } } diff --git a/application/src/main/java/net/emustudio/application/ApplicationApiImpl.java b/application/src/main/java/net/emustudio/application/ApplicationApiImpl.java index 16f5641ec..5b736bcbe 100644 --- a/application/src/main/java/net/emustudio/application/ApplicationApiImpl.java +++ b/application/src/main/java/net/emustudio/application/ApplicationApiImpl.java @@ -1,11 +1,11 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application; import net.emustudio.emulib.runtime.ApplicationApi; import net.emustudio.emulib.runtime.ContextPool; -import net.emustudio.emulib.runtime.interaction.Dialogs; -import net.emustudio.emulib.runtime.interaction.debugger.DebuggerTable; +import net.emustudio.emulib.runtime.ui.Dialogs; +import net.emustudio.emulib.runtime.ui.debugger.DebuggerTable; import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; diff --git a/application/src/main/java/net/emustudio/application/Constants.java b/application/src/main/java/net/emustudio/application/Constants.java index d55cee7b8..a56ffc172 100644 --- a/application/src/main/java/net/emustudio/application/Constants.java +++ b/application/src/main/java/net/emustudio/application/Constants.java @@ -1,11 +1,11 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application; import java.awt.*; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadFontResource; +import static net.emustudio.emulib.runtime.ui.GUI.loadFontResource; public class Constants { diff --git a/application/src/main/java/net/emustudio/application/Resources.java b/application/src/main/java/net/emustudio/application/Resources.java index e730bd4b7..abec562a4 100644 --- a/application/src/main/java/net/emustudio/application/Resources.java +++ b/application/src/main/java/net/emustudio/application/Resources.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application; diff --git a/application/src/main/java/net/emustudio/application/cmdline/AutomationCommand.java b/application/src/main/java/net/emustudio/application/cmdline/AutomationCommand.java index 96e2c69f1..1a517ec9d 100644 --- a/application/src/main/java/net/emustudio/application/cmdline/AutomationCommand.java +++ b/application/src/main/java/net/emustudio/application/cmdline/AutomationCommand.java @@ -1,11 +1,12 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.cmdline; import net.emustudio.application.emulation.Automation; -import net.emustudio.application.gui.ExtendedDialogs; -import net.emustudio.application.gui.GuiDialogsImpl; -import net.emustudio.application.gui.NoGuiDialogsImpl; +import net.emustudio.application.gui.framework.EmuStudioUI; +import net.emustudio.application.gui.framework.ExtendedDialogs; +import net.emustudio.application.gui.framework.GuiDialogsImpl; +import net.emustudio.application.gui.framework.NoGuiDialogsImpl; import net.emustudio.application.gui.debugtable.DebugTableModelImpl; import net.emustudio.application.gui.dialogs.LoadingDialog; import net.emustudio.application.settings.AppSettings; @@ -21,7 +22,6 @@ import java.util.Optional; import static net.emustudio.application.cmdline.Utils.*; -import static net.emustudio.application.gui.GuiUtils.setupLookAndFeel; @SuppressWarnings("unused") @CommandLine.Command(name = "automation", aliases = {"auto"}, description = "run emulation automation") @@ -48,7 +48,7 @@ public void run() { try { AppSettings appConfig = loadAppSettings(gui, true); if (gui) { - setupLookAndFeel(appConfig); + EmuStudioUI.initialize(appConfig); dialogs = new GuiDialogsImpl(); } diff --git a/application/src/main/java/net/emustudio/application/cmdline/Runner.java b/application/src/main/java/net/emustudio/application/cmdline/Runner.java index f9861854c..c6752f62e 100644 --- a/application/src/main/java/net/emustudio/application/cmdline/Runner.java +++ b/application/src/main/java/net/emustudio/application/cmdline/Runner.java @@ -1,10 +1,11 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.cmdline; import net.emustudio.application.Resources; -import net.emustudio.application.gui.ExtendedDialogs; -import net.emustudio.application.gui.GuiDialogsImpl; +import net.emustudio.application.gui.framework.EmuStudioUI; +import net.emustudio.application.gui.framework.ExtendedDialogs; +import net.emustudio.application.gui.framework.GuiDialogsImpl; import net.emustudio.application.gui.debugtable.DebugTableModelImpl; import net.emustudio.application.gui.dialogs.LoadingDialog; import net.emustudio.application.settings.AppSettings; @@ -22,7 +23,6 @@ import java.util.concurrent.atomic.AtomicInteger; import static net.emustudio.application.cmdline.Utils.*; -import static net.emustudio.application.gui.GuiUtils.setupLookAndFeel; import static net.emustudio.application.settings.ConfigFiles.listConfigurationNames; @SuppressWarnings("unused") @@ -81,7 +81,7 @@ public void run() { if (!runsSomeCommand) { try { AppSettings appConfig = loadAppSettings(true, false); - setupLookAndFeel(appConfig); + EmuStudioUI.initialize(appConfig); ExtendedDialogs dialogs = new GuiDialogsImpl(); Optional computerConfigOpt = (exclusive != null) ? exclusive.loadConfiguration() : diff --git a/application/src/main/java/net/emustudio/application/cmdline/Utils.java b/application/src/main/java/net/emustudio/application/cmdline/Utils.java index 6406a4f7a..562d2de0b 100644 --- a/application/src/main/java/net/emustudio/application/cmdline/Utils.java +++ b/application/src/main/java/net/emustudio/application/cmdline/Utils.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.cmdline; import net.emustudio.application.ApplicationApiImpl; -import net.emustudio.application.gui.ExtendedDialogs; +import net.emustudio.application.gui.framework.ExtendedDialogs; import net.emustudio.application.gui.debugtable.DebugTableModel; import net.emustudio.application.gui.debugtable.DebugTableModelImpl; import net.emustudio.application.gui.dialogs.LoadingDialog; diff --git a/application/src/main/java/net/emustudio/application/emulation/Automation.java b/application/src/main/java/net/emustudio/application/emulation/Automation.java index da8bcc1b8..1bd91178e 100644 --- a/application/src/main/java/net/emustudio/application/emulation/Automation.java +++ b/application/src/main/java/net/emustudio/application/emulation/Automation.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.emulation; @@ -11,7 +11,7 @@ import net.emustudio.emulib.plugins.cpu.CPU; import net.emustudio.emulib.plugins.device.Device; import net.emustudio.emulib.runtime.helpers.Unchecked; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/net/emustudio/application/emulation/AutomationException.java b/application/src/main/java/net/emustudio/application/emulation/AutomationException.java index 21c905ae6..3f2e41a2a 100644 --- a/application/src/main/java/net/emustudio/application/emulation/AutomationException.java +++ b/application/src/main/java/net/emustudio/application/emulation/AutomationException.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.emulation; diff --git a/application/src/main/java/net/emustudio/application/emulation/EmulationController.java b/application/src/main/java/net/emustudio/application/emulation/EmulationController.java index a6058926c..56c8c3519 100644 --- a/application/src/main/java/net/emustudio/application/emulation/EmulationController.java +++ b/application/src/main/java/net/emustudio/application/emulation/EmulationController.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.emulation; diff --git a/application/src/main/java/net/emustudio/application/gui/ConstantSizeButton.java b/application/src/main/java/net/emustudio/application/gui/ConstantSizeButton.java deleted file mode 100644 index dcea67ee8..000000000 --- a/application/src/main/java/net/emustudio/application/gui/ConstantSizeButton.java +++ /dev/null @@ -1,42 +0,0 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo - SPDX-License-Identifier: GPL-3.0-or-later */ -package net.emustudio.application.gui; - -import javax.swing.*; -import java.awt.*; -import java.awt.event.ActionEvent; -import java.util.function.Consumer; - -/** - * A button with the constant size. - */ -public class ConstantSizeButton extends JButton { - private final static int NB_WIDTH = 95; - private static int NB_HEIGHT = 30; - - public ConstantSizeButton(Action action) { - super(action); - - setHeight(); - Dimension d = getPreferredSize(); - d.setSize(NB_WIDTH, NB_HEIGHT); - this.setPreferredSize(d); - this.setSize(NB_WIDTH, NB_HEIGHT); - this.setMinimumSize(d); - this.setMaximumSize(d); - } - - public ConstantSizeButton(Consumer actionConsumer) { - this(new AbstractAction() { - @Override - public void actionPerformed(ActionEvent actionEvent) { - actionConsumer.accept(actionEvent); - } - }); - } - - private void setHeight() { - FontMetrics metrics = this.getFontMetrics(getFont()); - NB_HEIGHT = metrics.getHeight() + 9; - } -} diff --git a/application/src/main/java/net/emustudio/application/gui/GuiUtils.java b/application/src/main/java/net/emustudio/application/gui/GuiUtils.java deleted file mode 100644 index 999d02494..000000000 --- a/application/src/main/java/net/emustudio/application/gui/GuiUtils.java +++ /dev/null @@ -1,108 +0,0 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo - SPDX-License-Identifier: GPL-3.0-or-later */ -package net.emustudio.application.gui; - -import net.emustudio.application.settings.AppSettings; -import net.emustudio.plugins.device.mits88dcdd.gui.Constants; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.swing.*; - -import java.net.URL; - -import static net.emustudio.emulib.runtime.interaction.GuiConstants.*; - -public class GuiUtils { - private static final Logger LOGGER = LoggerFactory.getLogger(GuiUtils.class); - - public static void setupLookAndFeel(AppSettings config) { - String lookAndFeel = config.getLookAndFeel().orElse("com.sun.java.swing.plaf.gtk.GTKLookAndFeel"); - - try { - UIManager.setLookAndFeel(lookAndFeel); - } catch (Exception ignored) { - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (Exception e) { - LOGGER.warn("Unable to set system look and feel", e); - } - } - - UIManager.put("Button.background", UIManager.get("Panel.background")); - UIManager.put("Button.font", FONT_COMMON); - UIManager.put("Button.opaque", true); - - UIManager.put("CheckBox.font", FONT_COMMON); - UIManager.put("CheckBoxMenuItem.font", FONT_COMMON); - UIManager.put("CheckBoxMenuItem.acceleratorFont", FONT_COMMON); - - UIManager.put("ColorChooser.font", FONT_COMMON); - UIManager.put("ComboBox.font", FONT_COMMON); - - UIManager.put("TabbedPane.selected", UIManager.get("Panel.background")); - UIManager.put("TabbedPane.background", UIManager.get("Panel.background")); - UIManager.put("TabbedPane.contentAreaColor", UIManager.get("Panel.background")); - UIManager.put("TabbedPane.contentOpaque", true); - UIManager.put("TabbedPane.opaque", true); - UIManager.put("TabbedPane.tabsOpaque", true); - UIManager.put("TabbedPane.font", FONT_TITLE_BORDER); - UIManager.put("TabbedPane.smallFont", FONT_COMMON); - - UIManager.put("EditorPane.font", FONT_MONOSPACED); - UIManager.put("FormattedTextField.font", FONT_COMMON); - UIManager.put("IconButton.font", FONT_COMMON); - - UIManager.put("InternalFrame.optionDialogTitleFont", FONT_TITLE_BORDER); - UIManager.put("InternalFrame.paletteTitleFont", FONT_TITLE_BORDER); - UIManager.put("InternalFrame.titleFont", FONT_TITLE_BORDER); - UIManager.put("InternalFrame.opaque", true); - - UIManager.put("Label.font", FONT_COMMON); - UIManager.put("Label.opaque", true); - - UIManager.put("List.font", FONT_MONOSPACED); - UIManager.put("List.rendererUseUIBorder", true); - UIManager.put("List.focusCellHighlightBorder", null); - - UIManager.put("Menu.acceleratorFont", FONT_COMMON); - UIManager.put("Menu.font", FONT_COMMON); - - UIManager.put("MenuBar.font", FONT_COMMON); - - UIManager.put("MenuItem.acceleratorFont", FONT_COMMON); - UIManager.put("MenuItem.font", FONT_COMMON); - - UIManager.put("OptionPane.buttonFont", FONT_COMMON); - UIManager.put("OptionPane.font", FONT_COMMON); - UIManager.put("OptionPane.messageFont", FONT_COMMON); - - UIManager.put("Panel.font", FONT_COMMON); - UIManager.put("Panel.opaque", true); - - UIManager.put("PasswordField.font", FONT_COMMON); - UIManager.put("PopupMenu.font", FONT_COMMON); - UIManager.put("ProgressBar.font", FONT_COMMON); - UIManager.put("RadioButton.font", FONT_COMMON); - UIManager.put("RadioButtonMenuItem.acceleratorFont", FONT_COMMON); - UIManager.put("RadioButtonMenuItem.font", FONT_COMMON); - UIManager.put("ScrollPane.font", FONT_COMMON); - UIManager.put("Slider.font", FONT_COMMON); - UIManager.put("Spinner.font", FONT_COMMON); - - UIManager.put("Table.font", FONT_COMMON); - UIManager.put("Table.focusCellHighlightBorder", null); - - UIManager.put("TableHeader.font", FONT_TITLE_BORDER); - - UIManager.put("TextArea.font", FONT_MONOSPACED); - UIManager.put("TextField.font", FONT_MONOSPACED); - UIManager.put("TextPane.font", FONT_MONOSPACED); - UIManager.put("TitledBorder.font", FONT_TITLE_BORDER); - UIManager.put("ToggleButton.font", FONT_COMMON); - UIManager.put("ToolBar.font", FONT_COMMON); - UIManager.put("ToolTip.font", FONT_COMMON); - UIManager.put("Tree.font", FONT_COMMON); - UIManager.put("Viewport.font", FONT_COMMON); - } -} diff --git a/application/src/main/java/net/emustudio/application/gui/ToolbarToggleButton.java b/application/src/main/java/net/emustudio/application/gui/ToolbarToggleButton.java deleted file mode 100644 index 4a668261d..000000000 --- a/application/src/main/java/net/emustudio/application/gui/ToolbarToggleButton.java +++ /dev/null @@ -1,34 +0,0 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo - SPDX-License-Identifier: GPL-3.0-or-later */ -package net.emustudio.application.gui; - -import javax.swing.*; -import java.awt.event.ActionEvent; -import java.awt.event.ItemEvent; -import java.util.function.Consumer; - -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; - -public class ToolbarToggleButton extends JToggleButton { - - public ToolbarToggleButton(Consumer action, Consumer itemAction, String iconResource, - String tooltipText) { - - super(new AbstractAction() { - @Override - public void actionPerformed(ActionEvent actionEvent) { - action.accept(actionEvent); - } - }); - setIcon(loadIcon(iconResource)); - setToolTipText(tooltipText); - - setFocusable(false); - addItemListener(itemAction::accept); - } - - public ToolbarToggleButton(Consumer action, String iconResource, String tooltipText) { - this(action, (ItemEvent itemAction) -> { - }, iconResource, tooltipText); - } -} diff --git a/application/src/main/java/net/emustudio/application/gui/actions/AboutAction.java b/application/src/main/java/net/emustudio/application/gui/actions/AboutAction.java index 5e25b1c31..5bdc2498f 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/AboutAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/AboutAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions; @@ -9,7 +9,7 @@ import java.awt.event.KeyEvent; import java.util.Objects; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class AboutAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/application/gui/favicon16.png"; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/CompileAction.java b/application/src/main/java/net/emustudio/application/gui/actions/CompileAction.java index f9d849161..df4a476d9 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/CompileAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/CompileAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions; @@ -9,7 +9,7 @@ import net.emustudio.emulib.plugins.compiler.CompilerMessage; import net.emustudio.emulib.plugins.cpu.CPU; import net.emustudio.emulib.plugins.memory.Memory; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import javax.swing.*; import java.awt.event.ActionEvent; @@ -18,7 +18,8 @@ import java.util.Optional; import java.util.function.Supplier; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; + public class CompileAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/application/gui/dialogs/compile.png"; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/CompilerSettingsAction.java b/application/src/main/java/net/emustudio/application/gui/actions/CompilerSettingsAction.java index 28767fe33..6021fcb5b 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/CompilerSettingsAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/CompilerSettingsAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/ExitAction.java b/application/src/main/java/net/emustudio/application/gui/actions/ExitAction.java index dbcf2b86f..7dd146441 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/ExitAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/ExitAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/ViewComputerAction.java b/application/src/main/java/net/emustudio/application/gui/actions/ViewComputerAction.java index a067a3fad..1783c7d01 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/ViewComputerAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/ViewComputerAction.java @@ -1,11 +1,11 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions; import net.emustudio.application.gui.dialogs.ViewComputerDialog; import net.emustudio.application.settings.AppSettings; import net.emustudio.application.virtualcomputer.VirtualComputer; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import javax.swing.*; import java.awt.event.ActionEvent; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/editor/FindAction.java b/application/src/main/java/net/emustudio/application/gui/actions/editor/FindAction.java index 09d6b31a3..754ca8fcb 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/editor/FindAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/editor/FindAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.editor; @@ -10,7 +10,7 @@ import java.awt.event.KeyEvent; import java.util.Objects; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class FindAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/application/gui/dialogs/edit-find.png"; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/editor/FindNextAction.java b/application/src/main/java/net/emustudio/application/gui/actions/editor/FindNextAction.java index 67d2f874b..23eca5bd5 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/editor/FindNextAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/editor/FindNextAction.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.editor; import net.emustudio.application.gui.editor.Editor; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import javax.swing.*; import java.awt.event.ActionEvent; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/editor/FindPreviousAction.java b/application/src/main/java/net/emustudio/application/gui/actions/editor/FindPreviousAction.java index 442a96c94..087c4e7db 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/editor/FindPreviousAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/editor/FindPreviousAction.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.editor; import net.emustudio.application.gui.editor.Editor; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import javax.swing.*; import java.awt.event.ActionEvent; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/editor/NewFileAction.java b/application/src/main/java/net/emustudio/application/gui/actions/editor/NewFileAction.java index 76bfcb03c..a32517857 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/editor/NewFileAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/editor/NewFileAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.editor; @@ -10,7 +10,7 @@ import java.util.Objects; import java.util.function.Supplier; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class NewFileAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/application/gui/dialogs/document-new.png"; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/editor/OpenFileAction.java b/application/src/main/java/net/emustudio/application/gui/actions/editor/OpenFileAction.java index dd02d8432..d6d264888 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/editor/OpenFileAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/editor/OpenFileAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.editor; @@ -11,7 +11,7 @@ import java.util.Objects; import java.util.function.Supplier; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class OpenFileAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/application/gui/dialogs/document-open.png"; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/editor/ReplaceAction.java b/application/src/main/java/net/emustudio/application/gui/actions/editor/ReplaceAction.java index f61f9c990..655c1e90e 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/editor/ReplaceAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/editor/ReplaceAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.editor; @@ -10,7 +10,7 @@ import java.awt.event.KeyEvent; import java.util.Objects; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class ReplaceAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/application/gui/dialogs/edit-find-replace.png"; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/editor/SaveFileAction.java b/application/src/main/java/net/emustudio/application/gui/actions/editor/SaveFileAction.java index 271da8fb9..993a89f0b 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/editor/SaveFileAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/editor/SaveFileAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.editor; @@ -9,7 +9,7 @@ import java.awt.event.KeyEvent; import java.util.Objects; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class SaveFileAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/application/gui/dialogs/document-save.png"; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/editor/SaveFileAsAction.java b/application/src/main/java/net/emustudio/application/gui/actions/editor/SaveFileAsAction.java index 2040e3e13..e06a20a3e 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/editor/SaveFileAsAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/editor/SaveFileAsAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.editor; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/emulator/BreakpointAction.java b/application/src/main/java/net/emustudio/application/gui/actions/emulator/BreakpointAction.java index 78ecd432d..d6abbaee1 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/emulator/BreakpointAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/emulator/BreakpointAction.java @@ -1,16 +1,17 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.emulator; import net.emustudio.application.gui.dialogs.BreakpointDialog; import net.emustudio.application.virtualcomputer.VirtualComputer; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import javax.swing.*; import java.awt.event.ActionEvent; import java.util.Objects; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; + public class BreakpointAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/application/gui/dialogs/breakpoints.png"; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/emulator/JumpAction.java b/application/src/main/java/net/emustudio/application/gui/actions/emulator/JumpAction.java index 941cfb7a1..39667ed26 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/emulator/JumpAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/emulator/JumpAction.java @@ -1,15 +1,16 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.emulator; import net.emustudio.application.virtualcomputer.VirtualComputer; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import javax.swing.*; import java.awt.event.ActionEvent; import java.util.Objects; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; + public class JumpAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/application/gui/dialogs/go-jump.png"; @@ -30,8 +31,7 @@ public JumpAction(VirtualComputer computer, Dialogs dialogs, Runnable refreshDeb public void actionPerformed(ActionEvent actionEvent) { computer.getCPU().ifPresentOrElse(cpu -> { try { - dialogs - .readInteger("Memory address:", "Jump to address", 0) + dialogs.readInteger("Memory address:", "Jump to address", 0) .ifPresent(address -> { if (!cpu.setInstructionLocation(address)) { dialogs.showError("Invalid memory address (please check memory size)"); diff --git a/application/src/main/java/net/emustudio/application/gui/actions/emulator/JumpToBeginningAction.java b/application/src/main/java/net/emustudio/application/gui/actions/emulator/JumpToBeginningAction.java index 693a654f3..10bab02e9 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/emulator/JumpToBeginningAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/emulator/JumpToBeginningAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.emulator; @@ -8,7 +8,7 @@ import java.awt.event.ActionEvent; import java.util.Objects; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class JumpToBeginningAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/application/gui/dialogs/go-first.png"; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/emulator/PauseAction.java b/application/src/main/java/net/emustudio/application/gui/actions/emulator/PauseAction.java index 3af01a395..a56003d88 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/emulator/PauseAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/emulator/PauseAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.emulator; @@ -9,7 +9,7 @@ import java.util.Objects; import java.util.Optional; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class PauseAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/application/gui/dialogs/go-pause.png"; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/emulator/ResetAction.java b/application/src/main/java/net/emustudio/application/gui/actions/emulator/ResetAction.java index 941f9e084..2a5225662 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/emulator/ResetAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/emulator/ResetAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.emulator; @@ -8,7 +8,7 @@ import java.awt.event.ActionEvent; import java.util.Optional; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class ResetAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/application/gui/dialogs/reset.png"; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/emulator/RunAction.java b/application/src/main/java/net/emustudio/application/gui/actions/emulator/RunAction.java index d56d143ba..3bab9790f 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/emulator/RunAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/emulator/RunAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.emulator; @@ -9,7 +9,7 @@ import java.util.Objects; import java.util.Optional; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class RunAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/application/gui/dialogs/go-play.png"; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/emulator/RunTimedAction.java b/application/src/main/java/net/emustudio/application/gui/actions/emulator/RunTimedAction.java index 6b60cba01..dc0a915a8 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/emulator/RunTimedAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/emulator/RunTimedAction.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.emulator; import net.emustudio.application.emulation.EmulationController; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import javax.swing.*; import java.awt.event.ActionEvent; @@ -11,7 +11,8 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; + public class RunTimedAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/application/gui/dialogs/go-play-time.png"; @@ -30,9 +31,11 @@ public RunTimedAction(EmulationController emulationController, Dialogs dialogs) public void actionPerformed(ActionEvent actionEvent) { Optional.ofNullable(emulationController).ifPresent(c -> { try { - dialogs - .readInteger("Enter time slice in milliseconds:", "Timed emulation", 500) - .ifPresent(sliceMillis -> c.step(sliceMillis, TimeUnit.MILLISECONDS)); + dialogs.readInteger( + "Enter time slice in milliseconds:", + "Timed emulation", + 500 + ).ifPresent(sliceMillis -> c.step(sliceMillis, TimeUnit.MILLISECONDS)); } catch (NumberFormatException e) { dialogs.showError("Invalid number format", "Timed emulation"); } diff --git a/application/src/main/java/net/emustudio/application/gui/actions/emulator/ShowDeviceGuiAction.java b/application/src/main/java/net/emustudio/application/gui/actions/emulator/ShowDeviceGuiAction.java index 9cdf55c8d..c6faf7d2f 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/emulator/ShowDeviceGuiAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/emulator/ShowDeviceGuiAction.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.emulator; import net.emustudio.application.virtualcomputer.VirtualComputer; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/emulator/ShowDeviceSettingsAction.java b/application/src/main/java/net/emustudio/application/gui/actions/emulator/ShowDeviceSettingsAction.java index 8c9a94a3f..636d026c6 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/emulator/ShowDeviceSettingsAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/emulator/ShowDeviceSettingsAction.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.emulator; import net.emustudio.application.virtualcomputer.VirtualComputer; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/emulator/ShowMemoryAction.java b/application/src/main/java/net/emustudio/application/gui/actions/emulator/ShowMemoryAction.java index b8efda7a2..04ef6e726 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/emulator/ShowMemoryAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/emulator/ShowMemoryAction.java @@ -1,16 +1,16 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.emulator; import net.emustudio.application.virtualcomputer.VirtualComputer; import net.emustudio.emulib.plugins.memory.Memory; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import javax.swing.*; import java.awt.event.ActionEvent; import java.util.Objects; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class ShowMemoryAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/application/gui/dialogs/grid_memory.gif"; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/emulator/StepAction.java b/application/src/main/java/net/emustudio/application/gui/actions/emulator/StepAction.java index ba59f355e..4f98cd8c9 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/emulator/StepAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/emulator/StepAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.emulator; @@ -8,7 +8,7 @@ import java.awt.event.ActionEvent; import java.util.Optional; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class StepAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/application/gui/dialogs/go-next.png"; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/emulator/StepBackAction.java b/application/src/main/java/net/emustudio/application/gui/actions/emulator/StepBackAction.java index f97bc0b6f..7f51e0c9f 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/emulator/StepBackAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/emulator/StepBackAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.emulator; @@ -9,7 +9,7 @@ import java.awt.event.ActionEvent; import java.util.Objects; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class StepBackAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/application/gui/dialogs/go-previous.png"; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/emulator/StopAction.java b/application/src/main/java/net/emustudio/application/gui/actions/emulator/StopAction.java index 6a4a97d3e..b6cbe5611 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/emulator/StopAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/emulator/StopAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.emulator; @@ -8,7 +8,7 @@ import java.awt.event.ActionEvent; import java.util.Optional; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class StopAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/application/gui/dialogs/go-stop.png"; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/opencomputer/AddNewComputerAction.java b/application/src/main/java/net/emustudio/application/gui/actions/opencomputer/AddNewComputerAction.java index 67344d8f4..0f677b03a 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/opencomputer/AddNewComputerAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/opencomputer/AddNewComputerAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.opencomputer; @@ -7,7 +7,7 @@ import net.emustudio.application.settings.AppSettings; import net.emustudio.application.settings.ComputerConfig; import net.emustudio.emulib.runtime.helpers.Unchecked; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,7 +19,7 @@ import static net.emustudio.application.settings.ConfigFiles.createConfiguration; import static net.emustudio.application.settings.ConfigFiles.loadConfiguration; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class AddNewComputerAction extends AbstractAction { private final static Logger LOGGER = LoggerFactory.getLogger(AddNewComputerAction.class); diff --git a/application/src/main/java/net/emustudio/application/gui/actions/opencomputer/DeleteComputerAction.java b/application/src/main/java/net/emustudio/application/gui/actions/opencomputer/DeleteComputerAction.java index 1279fc9ee..9131cc45a 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/opencomputer/DeleteComputerAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/opencomputer/DeleteComputerAction.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.opencomputer; import net.emustudio.application.settings.ComputerConfig; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -14,7 +14,7 @@ import java.util.Optional; import static net.emustudio.application.settings.ConfigFiles.removeConfiguration; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class DeleteComputerAction extends AbstractAction { private final static Logger LOGGER = LoggerFactory.getLogger(DeleteComputerAction.class); diff --git a/application/src/main/java/net/emustudio/application/gui/actions/opencomputer/EditComputerAction.java b/application/src/main/java/net/emustudio/application/gui/actions/opencomputer/EditComputerAction.java index 38ad08a5b..fba8103ad 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/opencomputer/EditComputerAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/opencomputer/EditComputerAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.opencomputer; @@ -6,14 +6,14 @@ import net.emustudio.application.gui.schema.Schema; import net.emustudio.application.settings.AppSettings; import net.emustudio.application.settings.ComputerConfig; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import javax.swing.*; import java.awt.event.ActionEvent; import java.util.Objects; import java.util.Optional; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class EditComputerAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/application/gui/dialogs/computer.png"; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/opencomputer/OpenComputerAction.java b/application/src/main/java/net/emustudio/application/gui/actions/opencomputer/OpenComputerAction.java index 930072218..697036c4f 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/opencomputer/OpenComputerAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/opencomputer/OpenComputerAction.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.opencomputer; import net.emustudio.application.settings.ComputerConfig; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import javax.swing.*; import java.awt.event.ActionEvent; @@ -11,7 +11,7 @@ import java.util.Optional; import java.util.function.Consumer; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class OpenComputerAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/application/gui/dialogs/list-add.png"; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/opencomputer/RenameComputerAction.java b/application/src/main/java/net/emustudio/application/gui/actions/opencomputer/RenameComputerAction.java index d1b7f6fbc..91465169a 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/opencomputer/RenameComputerAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/opencomputer/RenameComputerAction.java @@ -1,10 +1,10 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.opencomputer; import net.emustudio.application.settings.ComputerConfig; -import net.emustudio.emulib.runtime.interaction.Dialogs; import net.emustudio.emulib.runtime.settings.CannotUpdateSettingException; +import net.emustudio.emulib.runtime.ui.Dialogs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -15,7 +15,7 @@ import java.util.Optional; import static net.emustudio.application.settings.ConfigFiles.renameConfiguration; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class RenameComputerAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/application/gui/dialogs/rename-computer.png"; diff --git a/application/src/main/java/net/emustudio/application/gui/actions/opencomputer/SaveSchemaAction.java b/application/src/main/java/net/emustudio/application/gui/actions/opencomputer/SaveSchemaAction.java index c78eead10..f8965cff7 100644 --- a/application/src/main/java/net/emustudio/application/gui/actions/opencomputer/SaveSchemaAction.java +++ b/application/src/main/java/net/emustudio/application/gui/actions/opencomputer/SaveSchemaAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.actions.opencomputer; @@ -8,7 +8,7 @@ import java.awt.event.ActionEvent; import java.util.Objects; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class SaveSchemaAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/application/gui/dialogs/document-save.png"; diff --git a/application/src/main/java/net/emustudio/application/gui/debugtable/BooleanCellEditor.java b/application/src/main/java/net/emustudio/application/gui/debugtable/BooleanCellEditor.java index 09a717499..d1f7a7bbd 100644 --- a/application/src/main/java/net/emustudio/application/gui/debugtable/BooleanCellEditor.java +++ b/application/src/main/java/net/emustudio/application/gui/debugtable/BooleanCellEditor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.debugtable; @@ -11,8 +11,8 @@ import java.awt.event.MouseListener; import java.util.EventObject; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.TABLE_COLOR_ROW_EVEN; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.TABLE_COLOR_ROW_ODD; +import static net.emustudio.emulib.runtime.ui.Constants.TABLE_COLOR_ROW_EVEN; +import static net.emustudio.emulib.runtime.ui.Constants.TABLE_COLOR_ROW_ODD; public class BooleanCellEditor extends AbstractCellEditor implements TableCellEditor, MouseListener { private final BooleanComponent component; diff --git a/application/src/main/java/net/emustudio/application/gui/debugtable/BooleanCellRenderer.java b/application/src/main/java/net/emustudio/application/gui/debugtable/BooleanCellRenderer.java index 3f4f83cac..2d66cedbc 100644 --- a/application/src/main/java/net/emustudio/application/gui/debugtable/BooleanCellRenderer.java +++ b/application/src/main/java/net/emustudio/application/gui/debugtable/BooleanCellRenderer.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.debugtable; @@ -8,8 +8,8 @@ import java.awt.*; import static net.emustudio.application.gui.debugtable.BooleanComponent.BOOLEAN_ICON; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.TABLE_COLOR_ROW_EVEN; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.TABLE_COLOR_ROW_ODD; +import static net.emustudio.emulib.runtime.ui.Constants.TABLE_COLOR_ROW_EVEN; +import static net.emustudio.emulib.runtime.ui.Constants.TABLE_COLOR_ROW_ODD; class BooleanCellRenderer extends DefaultTableCellRenderer implements TableCellRenderer { diff --git a/application/src/main/java/net/emustudio/application/gui/debugtable/BooleanComponent.java b/application/src/main/java/net/emustudio/application/gui/debugtable/BooleanComponent.java index 0f5cc0a64..f29f46642 100644 --- a/application/src/main/java/net/emustudio/application/gui/debugtable/BooleanComponent.java +++ b/application/src/main/java/net/emustudio/application/gui/debugtable/BooleanComponent.java @@ -1,10 +1,10 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.debugtable; import javax.swing.*; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class BooleanComponent extends JLabel { public static final Icon BOOLEAN_ICON = loadIcon("/net/emustudio/application/gui/dialogs/breakpoint.png"); diff --git a/application/src/main/java/net/emustudio/application/gui/debugtable/CallFlow.java b/application/src/main/java/net/emustudio/application/gui/debugtable/CallFlow.java index ee4059350..d26bdc2a1 100644 --- a/application/src/main/java/net/emustudio/application/gui/debugtable/CallFlow.java +++ b/application/src/main/java/net/emustudio/application/gui/debugtable/CallFlow.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.debugtable; diff --git a/application/src/main/java/net/emustudio/application/gui/debugtable/DebugTableImpl.java b/application/src/main/java/net/emustudio/application/gui/debugtable/DebugTableImpl.java index 97456d436..3b9c0aa12 100644 --- a/application/src/main/java/net/emustudio/application/gui/debugtable/DebugTableImpl.java +++ b/application/src/main/java/net/emustudio/application/gui/debugtable/DebugTableImpl.java @@ -1,9 +1,8 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.debugtable; -import net.emustudio.application.Constants; -import net.emustudio.emulib.runtime.interaction.debugger.DebuggerColumn; +import net.emustudio.emulib.runtime.ui.debugger.DebuggerColumn; import javax.swing.*; import javax.swing.table.TableColumn; @@ -12,7 +11,7 @@ import java.awt.event.ComponentEvent; import java.util.Objects; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.TABLE_COLOR_TABLE_GRID; +import static net.emustudio.emulib.runtime.ui.Constants.TABLE_COLOR_TABLE_GRID; public class DebugTableImpl extends JTable { private final DebugTableModel tableModel; diff --git a/application/src/main/java/net/emustudio/application/gui/debugtable/DebugTableModel.java b/application/src/main/java/net/emustudio/application/gui/debugtable/DebugTableModel.java index 712fd626a..f32b60303 100644 --- a/application/src/main/java/net/emustudio/application/gui/debugtable/DebugTableModel.java +++ b/application/src/main/java/net/emustudio/application/gui/debugtable/DebugTableModel.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.debugtable; -import net.emustudio.emulib.runtime.interaction.debugger.DebuggerColumn; -import net.emustudio.emulib.runtime.interaction.debugger.DebuggerTable; +import net.emustudio.emulib.runtime.ui.debugger.DebuggerColumn; +import net.emustudio.emulib.runtime.ui.debugger.DebuggerTable; import javax.swing.table.AbstractTableModel; diff --git a/application/src/main/java/net/emustudio/application/gui/debugtable/DebugTableModelImpl.java b/application/src/main/java/net/emustudio/application/gui/debugtable/DebugTableModelImpl.java index b83313306..6fb322bcf 100644 --- a/application/src/main/java/net/emustudio/application/gui/debugtable/DebugTableModelImpl.java +++ b/application/src/main/java/net/emustudio/application/gui/debugtable/DebugTableModelImpl.java @@ -1,10 +1,10 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.debugtable; import net.emustudio.emulib.plugins.cpu.CPU; import net.emustudio.emulib.plugins.cpu.Disassembler; -import net.emustudio.emulib.runtime.interaction.debugger.*; +import net.emustudio.emulib.runtime.ui.debugger.*; import javax.swing.event.TableModelEvent; import java.util.Arrays; diff --git a/application/src/main/java/net/emustudio/application/gui/debugtable/PagesPanel.java b/application/src/main/java/net/emustudio/application/gui/debugtable/PagesPanel.java index 6c014eb6b..2d3833349 100644 --- a/application/src/main/java/net/emustudio/application/gui/debugtable/PagesPanel.java +++ b/application/src/main/java/net/emustudio/application/gui/debugtable/PagesPanel.java @@ -1,9 +1,10 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.debugtable; -import net.emustudio.emulib.runtime.interaction.Dialogs; -import net.emustudio.emulib.runtime.interaction.ToolbarButton; +import net.emustudio.emulib.runtime.ui.Dialogs; +import net.emustudio.emulib.runtime.ui.GUI; +import net.emustudio.emulib.runtime.ui.components.ToolbarButton; import javax.swing.*; import java.util.Objects; @@ -34,12 +35,12 @@ public static PagesPanel create(DebugTableModel debugTableModel, Dialogs dialogs } private void initComponents() { - ToolbarButton btnFirst = new ToolbarButton(evt -> gotoFirstPage(), PAGE_FIRST_PNG, "Go to the first page"); - ToolbarButton btnBackward = new ToolbarButton(evt -> gotoPreviousPage(), PAGE_BACK_PNG, "Go to the previous page"); - ToolbarButton btnCurrentPage = new ToolbarButton(evt -> gotoCurrentPage(), PAGE_CURRENT_PNG, "Go to the current page"); - ToolbarButton btnForward = new ToolbarButton(evt -> gotoNextPage(), PAGE_FORWARD_PNG, "Go to the next page"); - ToolbarButton btnSeekBackward = new ToolbarButton(evt -> seekBackward(), PAGE_SEEK_BACKWARD_PNG, "Go to the current page"); - ToolbarButton btnSeekForward = new ToolbarButton(evt -> seekForward(), PAGE_SEEK_FORWARD_PNG, "Go to the current page"); + ToolbarButton btnFirst = GUI.toolbarButton(evt -> gotoFirstPage(), PAGE_FIRST_PNG, "Go to the first page"); + ToolbarButton btnBackward = GUI.toolbarButton(evt -> gotoPreviousPage(), PAGE_BACK_PNG, "Go to the previous page"); + ToolbarButton btnCurrentPage = GUI.toolbarButton(evt -> gotoCurrentPage(), PAGE_CURRENT_PNG, "Go to the current page"); + ToolbarButton btnForward = GUI.toolbarButton(evt -> gotoNextPage(), PAGE_FORWARD_PNG, "Go to the next page"); + ToolbarButton btnSeekBackward = GUI.toolbarButton(evt -> seekBackward(), PAGE_SEEK_BACKWARD_PNG, "Go to the current page"); + ToolbarButton btnSeekForward = GUI.toolbarButton(evt -> seekForward(), PAGE_SEEK_FORWARD_PNG, "Go to the current page"); GroupLayout pagesLayout = new GroupLayout(this); setLayout(pagesLayout); diff --git a/application/src/main/java/net/emustudio/application/gui/debugtable/PaginatingDisassembler.java b/application/src/main/java/net/emustudio/application/gui/debugtable/PaginatingDisassembler.java index 8eb12645c..2084749cd 100644 --- a/application/src/main/java/net/emustudio/application/gui/debugtable/PaginatingDisassembler.java +++ b/application/src/main/java/net/emustudio/application/gui/debugtable/PaginatingDisassembler.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.debugtable; diff --git a/application/src/main/java/net/emustudio/application/gui/debugtable/TextCellRenderer.java b/application/src/main/java/net/emustudio/application/gui/debugtable/TextCellRenderer.java index 8536dc706..2b572676d 100644 --- a/application/src/main/java/net/emustudio/application/gui/debugtable/TextCellRenderer.java +++ b/application/src/main/java/net/emustudio/application/gui/debugtable/TextCellRenderer.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.debugtable; @@ -9,7 +9,7 @@ import java.awt.*; import java.util.Objects; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.*; +import static net.emustudio.emulib.runtime.ui.Constants.*; class TextCellRenderer extends JLabel implements TableCellRenderer { diff --git a/application/src/main/java/net/emustudio/application/gui/dialogs/AboutDialog.java b/application/src/main/java/net/emustudio/application/gui/dialogs/AboutDialog.java index 7a2fb088c..7490d201e 100644 --- a/application/src/main/java/net/emustudio/application/gui/dialogs/AboutDialog.java +++ b/application/src/main/java/net/emustudio/application/gui/dialogs/AboutDialog.java @@ -1,129 +1,54 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.dialogs; + +import net.emustudio.application.gui.framework.EmuStudioUI; +import net.emustudio.emulib.runtime.ui.GUI; +import net.emustudio.emulib.runtime.ui.components.DialogBase; +import net.miginfocom.swing.MigLayout; + import javax.swing.*; import java.awt.*; -import java.awt.event.KeyEvent; import static net.emustudio.application.Resources.getCopyright; import static net.emustudio.application.Resources.getVersion; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; -public class AboutDialog extends JDialog { - private final static String ICON_FILE = "/net/emustudio/application/gui/dialogs/logo.png"; +public class AboutDialog extends DialogBase { public AboutDialog(JFrame parent) { - super(parent, true); - initComponents(); - setLocationRelativeTo(parent); + super(parent, "About emuStudio", true); + buildContent(); } - private void initComponents() { - JPanel panelLogo = new JPanel(); - JLabel lblLogo = new JLabel(loadIcon(ICON_FILE)); - JPanel panelInfo = new JPanel(); - JLabel lblName = new JLabel(); - JLabel lblCopyright = new JLabel(); - JLabel lblVersion = new JLabel(); - JLabel jLabel4 = new JLabel(); - JLabel jLabel1 = new JLabel(); - - setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); - getRootPane().registerKeyboardAction(e -> dispose(), KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_IN_FOCUSED_WINDOW); - - setTitle("About emuStudio"); - - lblLogo.setBackground(Color.WHITE); - lblLogo.setHorizontalAlignment(SwingConstants.CENTER); - lblLogo.setBorder(BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0))); - lblLogo.setDoubleBuffered(true); - lblLogo.setFocusable(false); - lblLogo.setOpaque(true); - lblLogo.setHorizontalTextPosition(SwingConstants.CENTER); - lblLogo.setIconTextGap(0); - - GroupLayout panelLogoLayout = new GroupLayout(panelLogo); - panelLogo.setLayout(panelLogoLayout); - panelLogoLayout.setHorizontalGroup( - panelLogoLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(panelLogoLayout.createSequentialGroup() - .addContainerGap() - .addComponent(lblLogo, GroupLayout.DEFAULT_SIZE, 145, Short.MAX_VALUE)) - ); - panelLogoLayout.setVerticalGroup( - panelLogoLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(panelLogoLayout.createSequentialGroup() - .addContainerGap() - .addComponent(lblLogo, GroupLayout.DEFAULT_SIZE, 165, Short.MAX_VALUE) - .addContainerGap()) - ); - - lblName.setFont(lblName.getFont().deriveFont(lblName.getFont().getStyle() | java.awt.Font.BOLD)); - lblName.setText("emuStudio"); - - lblCopyright.setText(getCopyright()); - - lblVersion.setFont(lblVersion.getFont().deriveFont(lblVersion.getFont().getStyle() | java.awt.Font.BOLD)); - lblVersion.setText(getVersion()); - - jLabel4.setText("Version"); - jLabel1.setText( - "

This program comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it " + - "under certain conditions; for details see https://www.gnu.org/licenses/gpl-3.0.html.
" + - "For more information about emuStudio, see https://www.emustudio.net/.

"); - - GroupLayout panelInfoLayout = new GroupLayout(panelInfo); - panelInfo.setLayout(panelInfoLayout); - panelInfoLayout.setHorizontalGroup( - panelInfoLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(panelInfoLayout.createSequentialGroup() - .addContainerGap() - .addGroup(panelInfoLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addComponent(lblName) - .addGroup(panelInfoLayout.createSequentialGroup() - .addComponent(jLabel4) - .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) - .addComponent(lblVersion)) - .addComponent(jLabel1, GroupLayout.PREFERRED_SIZE, 400, GroupLayout.PREFERRED_SIZE) - .addComponent(lblCopyright)) - .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - ); - panelInfoLayout.setVerticalGroup( - panelInfoLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(panelInfoLayout.createSequentialGroup() - .addContainerGap() - .addComponent(lblName) - .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(lblCopyright) - .addGap(18, 18, 18) - .addGroup(panelInfoLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) - .addComponent(lblVersion) - .addComponent(jLabel4)) - .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(jLabel1, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE) - .addContainerGap()) + @Override + protected JComponent initializeComponents() { + // Main panel with horizontal layout + JPanel mainPanel = new JPanel(new MigLayout("insets 10", "[][grow]", "[]")); + JLabel lblLogo = EmuStudioUI.createLogoJLabel(); + + // Info panel + JPanel infoPanel = new JPanel(new MigLayout("insets 10", "[grow]", "[]")); + infoPanel.add(GUI.titleLabel("emuStudio"), "wrap, gapbottom 10"); + infoPanel.add(GUI.label(getCopyright()), "wrap, gapbottom 10"); + + infoPanel.add(GUI.label("Version: "), "split 2"); + infoPanel.add(GUI.boldLabel(getVersion()), "wrap, gapbottom 10"); + + JLabel licenseInfo = new JLabel( + "

This program comes with ABSOLUTELY NO WARRANTY. " + + "This is free software, and you are welcome to redistribute it " + + "under certain conditions; for details see " + + "https://www.gnu.org/licenses/gpl-3.0.html.
" + + "For more information about emuStudio, see https://www.emustudio.net/.

" ); + licenseInfo.setPreferredSize(new Dimension(400, 80)); + infoPanel.add(licenseInfo, "wrap, grow"); - GroupLayout layout = new GroupLayout(getContentPane()); - getContentPane().setLayout(layout); - layout.setHorizontalGroup( - layout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addComponent(panelLogo, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) - .addGap(18, 18, 18) - .addComponent(panelInfo, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)) - ); - layout.setVerticalGroup( - layout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addContainerGap() - .addGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addComponent(panelInfo, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE) - .addComponent(panelLogo, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)) - .addContainerGap()) - ); + // Combine panels + mainPanel.add(lblLogo, ""); + mainPanel.add(infoPanel, "grow"); - pack(); + return mainPanel; } } diff --git a/application/src/main/java/net/emustudio/application/gui/dialogs/AutoDialog.java b/application/src/main/java/net/emustudio/application/gui/dialogs/AutoDialog.java index 25e427042..c08199034 100644 --- a/application/src/main/java/net/emustudio/application/gui/dialogs/AutoDialog.java +++ b/application/src/main/java/net/emustudio/application/gui/dialogs/AutoDialog.java @@ -1,21 +1,22 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.dialogs; import net.emustudio.application.virtualcomputer.VirtualComputer; import net.emustudio.emulib.plugins.cpu.CPU; +import net.emustudio.emulib.runtime.ui.GUI; +import net.emustudio.emulib.runtime.ui.components.DialogBase; import javax.swing.*; -import java.awt.event.ActionEvent; import java.util.Objects; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; /** * This is the dialog form that displays when the emuStudio automatization * is running. */ -public class AutoDialog extends JDialog { +public class AutoDialog extends DialogBase { private final static String ICON_FILE = "/net/emustudio/application/gui/dialogs/motherboard-icon.gif"; private final VirtualComputer computer; @@ -23,47 +24,30 @@ public class AutoDialog extends JDialog { private final JButton btnStop = new JButton("Stop"); public AutoDialog(VirtualComputer computer) { + super((JFrame) null, "Automatic Emulation", false); this.computer = Objects.requireNonNull(computer); - - initComponents(); - setLocationRelativeTo(null); + setResizable(false); + setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); + buildContent(); } - private void initComponents() { - JLabel lblPerforming = new JLabel(loadIcon(ICON_FILE)); - setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); - setResizable(false); + @Override + protected JComponent initializeComponents() { + JPanel panel = GUI.panelVertical(); - lblPerforming.setFont(lblPerforming.getFont().deriveFont(lblPerforming.getFont().getStyle() | java.awt.Font.BOLD)); - lblPerforming.setText("Running automatic emulation, please wait..."); + JLabel lblPerforming = GUI.boldLabel("Running automatic emulation, please wait..."); + lblPerforming.setIcon(loadIcon(ICON_FILE)); lblAction.setText("Initializing..."); - btnStop.addActionListener(this::btnStopActionPerformed); + btnStop.addActionListener(e -> computer.getCPU().ifPresent(CPU::stop)); btnStop.setEnabled(false); - GroupLayout layout = new GroupLayout(getContentPane()); - getContentPane().setLayout(layout); - layout.setHorizontalGroup( - layout.createSequentialGroup() - .addContainerGap() - .addGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addComponent(lblAction, GroupLayout.PREFERRED_SIZE, 338, GroupLayout.PREFERRED_SIZE) - .addComponent(lblPerforming) - .addGroup(GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addComponent(btnStop)) - ).addContainerGap()); - layout.setVerticalGroup( - layout.createSequentialGroup() - .addContainerGap() - .addComponent(lblPerforming) - .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(lblAction) - .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) - .addComponent(btnStop) - .addContainerGap()); + panel.add(lblPerforming, "wrap, gapbottom 10"); + panel.add(lblAction, "growx, wrap, gapbottom 10"); + panel.add(btnStop, "align right"); - pack(); + return panel; } /** @@ -78,8 +62,4 @@ public void setAction(String action, boolean enableStopButton) { lblAction.repaint(); btnStop.setEnabled(enableStopButton); } - - private void btnStopActionPerformed(ActionEvent e) { - computer.getCPU().ifPresent(CPU::stop); - } } diff --git a/application/src/main/java/net/emustudio/application/gui/dialogs/BreakpointDialog.java b/application/src/main/java/net/emustudio/application/gui/dialogs/BreakpointDialog.java index c1a9e3ec9..0855acdd1 100644 --- a/application/src/main/java/net/emustudio/application/gui/dialogs/BreakpointDialog.java +++ b/application/src/main/java/net/emustudio/application/gui/dialogs/BreakpointDialog.java @@ -1,20 +1,20 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.dialogs; -import net.emustudio.application.gui.ConstantSizeButton; import net.emustudio.emulib.runtime.helpers.RadixUtils; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; +import net.emustudio.emulib.runtime.ui.GUI; +import net.emustudio.emulib.runtime.ui.components.DialogBase; import javax.swing.*; -import java.awt.event.KeyEvent; import java.util.Objects; /** * The breakpoint dialog - it asks user for the address where should be * set or unset the breakpoint. */ -public class BreakpointDialog extends JDialog { +public class BreakpointDialog extends DialogBase { private final Dialogs dialogs; private int address = -1; // if adr == -1 then it means cancel @@ -22,13 +22,11 @@ public class BreakpointDialog extends JDialog { private JTextField txtAddress; public BreakpointDialog(JFrame parent, Dialogs dialogs) { - super(parent, true); + super(parent, "Set/unset breakpoint", true); this.dialogs = Objects.requireNonNull(dialogs); - - initComponents(); - setLocationRelativeTo(parent); - txtAddress.grabFocus(); + setResizable(false); + buildContent(); } public int getAddress() { @@ -39,43 +37,24 @@ public boolean isSet() { return set; } - private void initComponents() { - JLabel lblSetUnset = new JLabel(); - txtAddress = new JTextField(); - ConstantSizeButton btnSet = new ConstantSizeButton(this::btnSetActionPerformed); - ConstantSizeButton btnUnset = new ConstantSizeButton(this::btnUnsetActionPerformed); - - setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); - getRootPane().registerKeyboardAction(e -> dispose(), KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_IN_FOCUSED_WINDOW); - - setTitle("Set/unset breakpoint"); - setResizable(false); + @Override + protected JComponent initializeComponents() { + JPanel panel = GUI.panelVertical(); - lblSetUnset.setText("Set/unset breakpoint to address:"); - txtAddress.setText("0"); + panel.add(GUI.label("Set/unset breakpoint to address:"), "wrap, gapbottom 5"); - btnSet.setText("Set"); - btnUnset.setText("Unset"); + txtAddress = GUI.textField("0"); + panel.add(txtAddress, "growx, wrap, gapbottom 10"); - GroupLayout layout = new GroupLayout(getContentPane()); - getContentPane().setLayout(layout); + JPanel buttonPanel = GUI.panelButtons(); + buttonPanel.add(GUI.button("Unset", this::btnUnsetActionPerformed), ""); + buttonPanel.add(GUI.button("Set", this::btnSetActionPerformed), ""); - layout.setHorizontalGroup(layout.createSequentialGroup().addContainerGap() - .addGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addComponent(lblSetUnset).addComponent(txtAddress) - .addGroup(GroupLayout.Alignment.CENTER, layout.createSequentialGroup() - .addComponent(btnUnset).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) - .addComponent(btnSet))).addContainerGap()); - layout.setVerticalGroup(layout.createSequentialGroup().addContainerGap().addComponent(lblSetUnset) - .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) - .addComponent(txtAddress, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, - GroupLayout.PREFERRED_SIZE) - .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED) - .addGroup(layout.createParallelGroup(GroupLayout.Alignment.BASELINE) - .addComponent(btnUnset).addComponent(btnSet)).addContainerGap()); + panel.add(buttonPanel, "growx, span"); + SwingUtilities.invokeLater(() -> txtAddress.grabFocus()); - pack(); + return panel; } private boolean parseAddress() { @@ -89,14 +68,14 @@ private boolean parseAddress() { return true; } - private void btnSetActionPerformed(java.awt.event.ActionEvent evt) { + private void btnSetActionPerformed() { if (parseAddress()) { set = true; dispose(); } } - private void btnUnsetActionPerformed(java.awt.event.ActionEvent evt) { + private void btnUnsetActionPerformed() { if (parseAddress()) { set = false; dispose(); diff --git a/application/src/main/java/net/emustudio/application/gui/dialogs/EditorPanel.java b/application/src/main/java/net/emustudio/application/gui/dialogs/EditorPanel.java index d0a641bb4..0ea42b05f 100644 --- a/application/src/main/java/net/emustudio/application/gui/dialogs/EditorPanel.java +++ b/application/src/main/java/net/emustudio/application/gui/dialogs/EditorPanel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.dialogs; @@ -7,8 +7,8 @@ import net.emustudio.application.gui.editor.Editor; import net.emustudio.application.virtualcomputer.VirtualComputer; import net.emustudio.emulib.plugins.cpu.CPU; -import net.emustudio.emulib.runtime.interaction.Dialogs; -import net.emustudio.emulib.runtime.interaction.ToolbarButton; +import net.emustudio.emulib.runtime.ui.Dialogs; +import net.emustudio.emulib.runtime.ui.GUI; import org.fife.rsta.ui.search.FindDialog; import org.fife.rsta.ui.search.ReplaceDialog; import org.fife.ui.rtextarea.RTextArea; @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.function.Supplier; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.FONT_MONOSPACED; +import static net.emustudio.emulib.runtime.ui.Constants.FONT_MONOSPACED; public class EditorPanel extends JPanel { private final static int MIN_COMPILER_OUTPUT_HEIGHT = 200; @@ -36,7 +36,7 @@ public class EditorPanel extends JPanel { private final ReplaceDialog replaceDialog; private final FindDialog findDialog; - private final JSplitPane splitSource = new JSplitPane(); + private final JSplitPane splitSource = GUI.splitPane(); public EditorPanel(JFrame parent, Dialogs dialogs, Editor editor, VirtualComputer computer, Runnable updateTitle, Supplier runState) { @@ -70,32 +70,15 @@ public EditorPanel(JFrame parent, Dialogs dialogs, Editor editor, VirtualCompute splitSource.setBorder(null); splitSource.setOrientation(JSplitPane.VERTICAL_SPLIT); splitSource.setOneTouchExpandable(true); + splitSource.setResizeWeight(1.0); splitSource.setLeftComponent(editor.getView()); splitSource.setRightComponent(compilerPane); JToolBar mainToolBar = setupMainToolbar(); - mainToolBar.setRollover(true); - - GroupLayout panelSourceLayout = new GroupLayout(this); - setLayout(panelSourceLayout); - panelSourceLayout.setHorizontalGroup( - panelSourceLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addComponent(mainToolBar) - .addGroup( - panelSourceLayout - .createSequentialGroup() - .addContainerGap() - .addComponent(splitSource) - .addContainerGap() - ) - ); - panelSourceLayout.setVerticalGroup( - panelSourceLayout - .createSequentialGroup() - .addComponent(mainToolBar, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE) - .addComponent(splitSource, 10, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE) - .addContainerGap() - ); + + setLayout(new net.miginfocom.swing.MigLayout("insets 0, fill", "[grow]", "[][grow]")); + add(mainToolBar, "growx, wrap"); + add(splitSource, "grow, gaptop 0"); } public void resizeComponents(int height) { @@ -148,46 +131,43 @@ public final boolean confirmSave() { } private JToolBar setupMainToolbar() { - JToolBar mainToolBar = new JToolBar(); - - mainToolBar.setFloatable(false); - mainToolBar.setBorderPainted(false); - mainToolBar.setRollover(true); + JToolBar mainToolBar = GUI.toolBar(); - mainToolBar.add(new ToolbarButton(newFileAction)); - mainToolBar.add(new ToolbarButton(openFileAction)); - mainToolBar.add(new ToolbarButton(saveFileAction)); + mainToolBar.add(GUI.toolbarButton(newFileAction)); + mainToolBar.add(GUI.toolbarButton(openFileAction)); + mainToolBar.add(GUI.toolbarButton(saveFileAction)); mainToolBar.addSeparator(); - mainToolBar.add(new ToolbarButton( + mainToolBar.add(GUI.toolbarButton( RTextArea.getAction(RTextArea.UNDO_ACTION), "/net/emustudio/application/gui/dialogs/edit-undo.png", "Undo" )); - mainToolBar.add(new ToolbarButton(RTextArea.getAction(RTextArea.REDO_ACTION), + mainToolBar.add(GUI.toolbarButton( + RTextArea.getAction(RTextArea.REDO_ACTION), "/net/emustudio/application/gui/dialogs/edit-redo.png", "Redo" )); mainToolBar.addSeparator(); - mainToolBar.add(new ToolbarButton( + mainToolBar.add(GUI.toolbarButton( RTextArea.getAction(RTextArea.CUT_ACTION), "/net/emustudio/application/gui/dialogs/edit-cut.png", "Cut selection" )); - mainToolBar.add(new ToolbarButton( + mainToolBar.add(GUI.toolbarButton( RTextArea.getAction(RTextArea.COPY_ACTION), "/net/emustudio/application/gui/dialogs/edit-copy.png", "Copy selection" )); - mainToolBar.add(new ToolbarButton( + mainToolBar.add(GUI.toolbarButton( RTextArea.getAction(RTextArea.PASTE_ACTION), "/net/emustudio/application/gui/dialogs/edit-paste.png", "Paste from clipboard" )); mainToolBar.addSeparator(); - mainToolBar.add(new ToolbarButton(findAction)); - mainToolBar.add(new ToolbarButton(replaceAction)); + mainToolBar.add(GUI.toolbarButton(findAction)); + mainToolBar.add(GUI.toolbarButton(replaceAction)); mainToolBar.addSeparator(); - mainToolBar.add(new ToolbarButton(compileAction)); + mainToolBar.add(GUI.toolbarButton(compileAction)); return mainToolBar; } diff --git a/application/src/main/java/net/emustudio/application/gui/dialogs/EmulatorPanel.java b/application/src/main/java/net/emustudio/application/gui/dialogs/EmulatorPanel.java index 8cb8f9ee6..438655fc2 100644 --- a/application/src/main/java/net/emustudio/application/gui/dialogs/EmulatorPanel.java +++ b/application/src/main/java/net/emustudio/application/gui/dialogs/EmulatorPanel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.dialogs; @@ -7,13 +7,15 @@ import net.emustudio.application.gui.debugtable.DebugTableImpl; import net.emustudio.application.gui.debugtable.DebugTableModel; import net.emustudio.application.gui.debugtable.PagesPanel; +import net.emustudio.application.gui.framework.EmuStudioUI; import net.emustudio.application.virtualcomputer.VirtualComputer; import net.emustudio.emulib.plugins.cpu.CPU; import net.emustudio.emulib.plugins.device.Device; import net.emustudio.emulib.plugins.memory.Memory; import net.emustudio.emulib.plugins.memory.MemoryContext; -import net.emustudio.emulib.runtime.interaction.Dialogs; -import net.emustudio.emulib.runtime.interaction.ToolbarButton; +import net.emustudio.emulib.runtime.ui.Dialogs; +import net.emustudio.emulib.runtime.ui.GUI; +import net.miginfocom.swing.MigLayout; import javax.swing.*; import java.awt.event.*; @@ -27,12 +29,12 @@ public class EmulatorPanel extends JPanel { private final JPanel statusWindow = new JPanel(); private final GroupLayout statusWindowLayout = new GroupLayout(statusWindow); - private final JToolBar toolDebug = new JToolBar(); + private final JToolBar toolDebug = GUI.toolBar(); private final JPanel panelPages; - private final JScrollPane paneDebug = new JScrollPane(); + private final JScrollPane paneDebug; private final JList lstDevices = new JList<>(); - private final JSplitPane splitPerDebug = new JSplitPane(); + private final JSplitPane splitPerDebug = GUI.splitPane(); private final DebugTableModel debugTableModel; private final JTable debugTable; @@ -62,10 +64,12 @@ public EmulatorPanel(JFrame parent, VirtualComputer computer, DebugTableModel de this.debugTableModel = Objects.requireNonNull(debugTableModel); this.debugTable = new DebugTableImpl(debugTableModel); - paneDebug.setViewportView(debugTable); + paneDebug = GUI.scrollPane(debugTable); paneDebug.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); debugTable.setFillsViewportHeight(true); + GUI.styleTable(debugTable); + paneDebug.addComponentListener(new ComponentAdapter() { @Override public void componentResized(ComponentEvent e) { @@ -73,12 +77,10 @@ public void componentResized(ComponentEvent e) { } }); - statusWindow.setBorder(BorderFactory.createTitledBorder("Status")); + EmuStudioUI.stylePanel(statusWindow, "Status"); statusWindow.setLayout(statusWindowLayout); - computer.getCPU() - .flatMap(cpu -> Optional.ofNullable(cpu.getStatusPanel())) - .ifPresent(this::setStatusPanel); + computer.getCPU().flatMap(cpu -> Optional.ofNullable(cpu.getStatusPanel())).ifPresent(this::setStatusPanel); this.stepBackAction = new StepBackAction(computer, debugTableModel, this::refreshDebugTable); this.resetAction = new ResetAction(emulationController); @@ -99,24 +101,11 @@ public void componentResized(ComponentEvent e) { panelPages = PagesPanel.create(debugTableModel, dialogs); - JPanel debuggerPanel = new JPanel(); - debuggerPanel.setBorder(BorderFactory.createTitledBorder("Debugger")); - GroupLayout debuggerPanelLayout = new GroupLayout(debuggerPanel); - - debuggerPanelLayout.setAutoCreateGaps(true); - debuggerPanelLayout.setAutoCreateContainerGaps(true); - - debuggerPanel.setLayout(debuggerPanelLayout); - debuggerPanelLayout.setHorizontalGroup( - debuggerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addComponent(toolDebug) - .addComponent(paneDebug) - .addComponent(panelPages)); - debuggerPanelLayout.setVerticalGroup( - debuggerPanelLayout.createSequentialGroup() - .addComponent(toolDebug, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE) - .addComponent(paneDebug, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(panelPages, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)); + JPanel debuggerPanel = new JPanel(new MigLayout("insets dialog", "[grow]", "[][grow][]")); + EmuStudioUI.stylePanel(debuggerPanel, "Debugger"); + debuggerPanel.add(toolDebug, "growx, wrap"); + debuggerPanel.add(paneDebug, "grow, wrap"); + debuggerPanel.add(panelPages, "growx"); this.showDeviceSettingsAction = new ShowDeviceSettingsAction(parent, computer, dialogs, lstDevices::getSelectedIndex); this.showDeviceGuiAction = new ShowDeviceGuiAction(parent, computer, dialogs, lstDevices::getSelectedIndex); @@ -150,60 +139,38 @@ public void mouseClicked(MouseEvent e) { } }); - JPanel peripheralPanel = new JPanel(); - peripheralPanel.setBorder(BorderFactory.createTitledBorder("Peripheral devices")); - JScrollPane paneDevices = new JScrollPane(); - paneDevices.setViewportView(lstDevices); + JPanel peripheralPanel = new JPanel(new MigLayout("insets dialog", "[grow]", "[grow][]")); + EmuStudioUI.stylePanel(peripheralPanel, "Peripheral devices"); + JScrollPane paneDevices = GUI.scrollPane(lstDevices); + GUI.styleList(lstDevices); JButton btnShowSettings = new JButton(showDeviceSettingsAction); JButton btnShowGUI = new JButton(showDeviceGuiAction); - GroupLayout peripheralPanelLayout = new GroupLayout(peripheralPanel); - peripheralPanel.setLayout(peripheralPanelLayout); - peripheralPanelLayout.setHorizontalGroup( - peripheralPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addComponent(paneDevices) - .addGroup(GroupLayout.Alignment.TRAILING, - peripheralPanelLayout.createSequentialGroup() - .addContainerGap() - .addComponent(btnShowSettings) - .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) - .addComponent(btnShowGUI) - .addContainerGap())); - peripheralPanelLayout.setVerticalGroup( - peripheralPanelLayout.createSequentialGroup() - .addComponent(paneDevices) - .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) - .addGroup(peripheralPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) - .addComponent(btnShowSettings) - .addComponent(btnShowGUI))); + peripheralPanel.add(paneDevices, "grow, wrap"); + peripheralPanel.add(btnShowSettings, "split 2, sizegroup btns, tag ok"); + peripheralPanel.add(btnShowGUI, "sizegroup btns, tag cancel"); splitPerDebug.setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1)); splitPerDebug.setDividerLocation(500); splitPerDebug.setOrientation(JSplitPane.VERTICAL_SPLIT); splitPerDebug.setAutoscrolls(true); splitPerDebug.setContinuousLayout(true); + splitPerDebug.setResizeWeight(1.0); splitPerDebug.setTopComponent(debuggerPanel); splitPerDebug.setRightComponent(peripheralPanel); - JSplitPane splitLeftRight = new JSplitPane(); + JSplitPane splitLeftRight = GUI.splitPane(); splitLeftRight.setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1)); splitLeftRight.setContinuousLayout(true); splitLeftRight.setFocusable(false); splitLeftRight.setDividerLocation(1.0); + splitLeftRight.setResizeWeight(1.0); splitLeftRight.setRightComponent(statusWindow); splitLeftRight.setLeftComponent(splitPerDebug); - GroupLayout panelEmulatorLayout = new GroupLayout(this); - setLayout(panelEmulatorLayout); - panelEmulatorLayout.setHorizontalGroup( - panelEmulatorLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addComponent(splitLeftRight)); - panelEmulatorLayout.setVerticalGroup( - panelEmulatorLayout.createSequentialGroup() - .addContainerGap() - .addComponent(splitLeftRight, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE) - .addContainerGap()); + setLayout(new MigLayout("insets dialog, fill", "[grow]", "[grow]")); + add(splitLeftRight, "grow"); this.memoryListener = new MemoryContext.MemoryListener() { @Override @@ -259,34 +226,26 @@ public CPU.RunState getRunState() { private void setStatusPanel(JPanel statusPanel) { - statusWindowLayout.setHorizontalGroup( - statusWindowLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addComponent(statusPanel)); - statusWindowLayout.setVerticalGroup( - statusWindowLayout.createSequentialGroup() - .addComponent(statusPanel)); + statusWindowLayout.setHorizontalGroup(statusWindowLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(statusPanel)); + statusWindowLayout.setVerticalGroup(statusWindowLayout.createSequentialGroup().addComponent(statusPanel)); } private void setupDebugToolbar() { - toolDebug.setFloatable(false); - toolDebug.setRollover(true); - toolDebug.setBorderPainted(false); - - toolDebug.add(new ToolbarButton(resetAction)); + toolDebug.add(GUI.toolbarButton(resetAction)); toolDebug.addSeparator(); - toolDebug.add(new ToolbarButton(jumpToBeginningAction)); - toolDebug.add(new ToolbarButton(stepBackAction)); - toolDebug.add(new ToolbarButton(stopAction)); - toolDebug.add(new ToolbarButton(pauseAction)); - toolDebug.add(new ToolbarButton(runAction)); - toolDebug.add(new ToolbarButton(runTimedAction)); - toolDebug.add(new ToolbarButton(stepAction)); + toolDebug.add(GUI.toolbarButton(jumpToBeginningAction)); + toolDebug.add(GUI.toolbarButton(stepBackAction)); + toolDebug.add(GUI.toolbarButton(stopAction)); + toolDebug.add(GUI.toolbarButton(pauseAction)); + toolDebug.add(GUI.toolbarButton(runAction)); + toolDebug.add(GUI.toolbarButton(runTimedAction)); + toolDebug.add(GUI.toolbarButton(stepAction)); toolDebug.addSeparator(); - toolDebug.add(new ToolbarButton(jumpAction)); + toolDebug.add(GUI.toolbarButton(jumpAction)); toolDebug.addSeparator(); - toolDebug.add(new ToolbarButton(breakpointAction)); + toolDebug.add(GUI.toolbarButton(breakpointAction)); toolDebug.addSeparator(); - toolDebug.add(new ToolbarButton(showMemoryAction)); + toolDebug.add(GUI.toolbarButton(showMemoryAction)); } private void refreshDebugTable() { diff --git a/application/src/main/java/net/emustudio/application/gui/dialogs/LoadingDialog.java b/application/src/main/java/net/emustudio/application/gui/dialogs/LoadingDialog.java index 322594003..6803932d0 100644 --- a/application/src/main/java/net/emustudio/application/gui/dialogs/LoadingDialog.java +++ b/application/src/main/java/net/emustudio/application/gui/dialogs/LoadingDialog.java @@ -1,49 +1,33 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.dialogs; +import net.emustudio.emulib.runtime.ui.GUI; +import net.emustudio.emulib.runtime.ui.components.DialogBase; + import javax.swing.*; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; -public class LoadingDialog extends JDialog { +public class LoadingDialog extends DialogBase { private final static String ICON_FILE = "/net/emustudio/application/gui/dialogs/loading.gif"; public LoadingDialog() { - super(); - initComponents(); - setLocationRelativeTo(null); + super((JFrame) null, "emuStudio", false); + setResizable(false); + buildContent(); } - private void initComponents() { + @Override + protected JComponent initializeComponents() { + JPanel panel = GUI.panelVertical(); - JLabel lblLoading = new JLabel(loadIcon(ICON_FILE)); - JLabel lblWarning = new JLabel(); + JLabel lblLoading = GUI.boldLabel("Loading computer, please wait..."); + lblLoading.setIcon(loadIcon(ICON_FILE)); - setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); - setResizable(false); - setTitle("emuStudio"); - - lblLoading.setFont(lblLoading.getFont().deriveFont(lblLoading.getFont().getStyle() | java.awt.Font.BOLD)); - lblLoading.setText("Loading computer, please wait..."); - - lblWarning.setText("If you see some errors, please see the log file."); - - GroupLayout layout = new GroupLayout(getContentPane()); - getContentPane().setLayout(layout); - layout.setHorizontalGroup( - layout.createSequentialGroup().addContainerGap() - .addGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addComponent(lblWarning, GroupLayout.PREFERRED_SIZE, 338, - GroupLayout.PREFERRED_SIZE).addComponent(lblLoading)) - .addContainerGap()); - layout.setVerticalGroup( - layout.createSequentialGroup().addContainerGap() - .addComponent(lblLoading).addPreferredGap(LayoutStyle - .ComponentPlacement.UNRELATED).addComponent(lblWarning) - .addContainerGap(lblWarning.getPreferredSize().height, - lblWarning.getPreferredSize().height).addContainerGap()); - - pack(); + panel.add(lblLoading, "wrap, gapbottom 10"); + panel.add(GUI.label("If you see some errors, please see the log file."), "wrap"); + + return panel; } } diff --git a/application/src/main/java/net/emustudio/application/gui/dialogs/OpenComputerDialog.java b/application/src/main/java/net/emustudio/application/gui/dialogs/OpenComputerDialog.java index 175afe24e..f2a1741a7 100644 --- a/application/src/main/java/net/emustudio/application/gui/dialogs/OpenComputerDialog.java +++ b/application/src/main/java/net/emustudio/application/gui/dialogs/OpenComputerDialog.java @@ -1,19 +1,23 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.dialogs; import net.emustudio.application.gui.actions.opencomputer.*; +import net.emustudio.application.gui.framework.EmuStudioUI; import net.emustudio.application.gui.schema.Schema; import net.emustudio.application.gui.schema.SchemaPreviewPanel; import net.emustudio.application.settings.AppSettings; import net.emustudio.application.settings.ComputerConfig; -import net.emustudio.emulib.runtime.interaction.Dialogs; -import net.emustudio.emulib.runtime.interaction.ToolbarButton; +import net.emustudio.emulib.runtime.ui.Dialogs; +import net.emustudio.emulib.runtime.ui.GUI; +import net.emustudio.emulib.runtime.ui.components.DialogBase; +import net.emustudio.emulib.runtime.ui.components.ToolbarButton; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.swing.*; import javax.swing.event.ListSelectionEvent; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; @@ -25,9 +29,10 @@ import java.util.Optional; import java.util.function.Consumer; +import static net.emustudio.application.Resources.getVersion; import static net.emustudio.application.settings.ConfigFiles.loadConfigurations; -public class OpenComputerDialog extends JDialog { +public class OpenComputerDialog extends DialogBase { private final static Logger LOGGER = LoggerFactory.getLogger(OpenComputerDialog.class); private final ConfigurationsListModel configurationsModel; @@ -44,8 +49,8 @@ public class OpenComputerDialog extends JDialog { private final JList lstConfig = new JList<>(); - public OpenComputerDialog(AppSettings appSettings, Dialogs dialogs, - Consumer selectComputer) { + public OpenComputerDialog(AppSettings appSettings, Dialogs dialogs, Consumer selectComputer) { + super((java.awt.Frame) null, "emuStudio - Open virtual computer", true); this.configurationsModel = new ConfigurationsListModel(); this.appSettings = Objects.requireNonNull(appSettings); this.dialogs = Objects.requireNonNull(dialogs); @@ -58,11 +63,11 @@ public OpenComputerDialog(AppSettings appSettings, Dialogs dialogs, renameComputerAction = new RenameComputerAction(dialogs, this::update, lstConfig); saveSchemaAction = new SaveSchemaAction(preview); - setModal(true); - initComponents(); - setLocationRelativeTo(null); - lstConfig.setModel(configurationsModel); + + buildContent(); + setMinimumSize(new Dimension(700, 500)); + setSize(900, 650); } void update() { @@ -71,32 +76,21 @@ void update() { lstConfigValueChanged(null); } - private void initComponents() { - JSplitPane splitConfig = new JSplitPane(); + @Override + protected JComponent initializeComponents() { + JSplitPane splitConfig = GUI.splitPane(); JPanel panelConfig = new JPanel(); JScrollPane configScrollPane = new JScrollPane(); - JToolBar toolConfig = new JToolBar(); - ToolbarButton btnAdd = new ToolbarButton(addNewComputerAction); + JToolBar toolConfig = GUI.toolBar(); + ToolbarButton btnAdd = GUI.toolbarButton(addNewComputerAction); ToolbarButton btnDelete = new ToolbarButton(deleteComputerAction); ToolbarButton btnEdit = new ToolbarButton(editComputerAction); ToolbarButton btnRename = new ToolbarButton(renameComputerAction); ToolbarButton btnSaveSchemaImage = new ToolbarButton(saveSchemaAction); - JPanel panelPreview = new JPanel(); - JScrollPane scrollPreview = new JScrollPane(); - JLabel jLabel1 = new JLabel(); + JScrollPane scrollPreview = GUI.scrollPane(preview); JButton btnOpen = new JButton(); JButton btnClose = new JButton(); - - setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); - getRootPane().registerKeyboardAction(e -> dispose(), KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_IN_FOCUSED_WINDOW); - - setTitle("emuStudio - Open virtual computer"); - - splitConfig.setDividerLocation(300); - splitConfig.setMinimumSize(new java.awt.Dimension(50, 102)); - splitConfig.setPreferredSize(new java.awt.Dimension(400, 300)); - - panelConfig.setPreferredSize(new java.awt.Dimension(200, 300)); + JLabel lblLogo = EmuStudioUI.createLogoJLabel(); lstConfig.addMouseListener(new MouseAdapter() { public void mouseClicked(MouseEvent evt) { @@ -107,91 +101,71 @@ public void mouseClicked(MouseEvent evt) { lstConfig.registerKeyboardAction(openComputerAction, KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), JComponent.WHEN_IN_FOCUSED_WINDOW); configScrollPane.setViewportView(lstConfig); + configScrollPane.setBorder(BorderFactory.createLineBorder(UIManager.getColor("Component.borderColor"))); + GUI.styleList(lstConfig); - toolConfig.setFloatable(false); - toolConfig.setRollover(true); - + toolConfig.setOrientation(JToolBar.VERTICAL); toolConfig.add(btnAdd); toolConfig.add(btnDelete); toolConfig.add(btnEdit); toolConfig.add(btnRename); toolConfig.add(btnSaveSchemaImage); - GroupLayout panelConfigLayout = new GroupLayout(panelConfig); - panelConfig.setLayout(panelConfigLayout); - panelConfigLayout.setHorizontalGroup( - panelConfigLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addComponent(toolConfig, GroupLayout.DEFAULT_SIZE, 199, Short.MAX_VALUE) - .addComponent(configScrollPane, GroupLayout.DEFAULT_SIZE, 199, Short.MAX_VALUE) - ); - panelConfigLayout.setVerticalGroup( - panelConfigLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(panelConfigLayout.createSequentialGroup() - .addComponent(toolConfig, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE) - .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) - .addComponent(configScrollPane, GroupLayout.DEFAULT_SIZE, 200, Short.MAX_VALUE)) - ); + panelConfig.setLayout(new net.miginfocom.swing.MigLayout("insets 0, fill", "[][grow]", "[grow]")); + panelConfig.add(toolConfig, "growy"); + panelConfig.add(configScrollPane, "grow"); + splitConfig.setResizeWeight(0.3); splitConfig.setLeftComponent(panelConfig); + splitConfig.setRightComponent(scrollPreview); - scrollPreview.setViewportView(preview); + JLabel lblIntroduction = new JLabel("

Welcome to emuStudio!

Version:" + getVersion() + ""); + lblIntroduction.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 10)); - GroupLayout panelPreviewLayout = new GroupLayout(panelPreview); - panelPreview.setLayout(panelPreviewLayout); - panelPreviewLayout.setHorizontalGroup( - panelPreviewLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addComponent(scrollPreview, GroupLayout.DEFAULT_SIZE, 586, Short.MAX_VALUE) - ); - panelPreviewLayout.setVerticalGroup( - panelPreviewLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(panelPreviewLayout.createSequentialGroup() - .addComponent(scrollPreview, GroupLayout.DEFAULT_SIZE, 308, Short.MAX_VALUE)) - ); + JLabel lblPlease = new JLabel("Please select computer you wish to emulate:"); + lblPlease.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 10)); - splitConfig.setRightComponent(panelPreview); + // Create a vertical panel for introduction and selection prompt + JPanel textPanel = new JPanel(new java.awt.BorderLayout()); + textPanel.add(lblIntroduction, java.awt.BorderLayout.NORTH); + textPanel.add(lblPlease, java.awt.BorderLayout.CENTER); - jLabel1.setText("Please select a virtual configuration that will be emulated:"); + // Create header panel with logo and introduction + JPanel headerPanel = new JPanel(new java.awt.BorderLayout(10, 0)); + headerPanel.setBorder(BorderFactory.createEmptyBorder(15, 15, 15, 15)); // Top, Left, Bottom, Right + headerPanel.add(lblLogo, java.awt.BorderLayout.WEST); + headerPanel.add(textPanel, java.awt.BorderLayout.CENTER); - btnOpen.setFont(btnOpen.getFont().deriveFont(btnOpen.getFont().getStyle() | java.awt.Font.BOLD)); btnOpen.setText("Open computer"); btnOpen.addActionListener(openComputerAction); + GUI.buttonMakePrimary(btnOpen); btnClose.setText("Exit"); btnClose.addActionListener(this::btnCloseActionPerformed); - GroupLayout layout = new GroupLayout(getContentPane()); - getContentPane().setLayout(layout); - layout.setHorizontalGroup( - layout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addContainerGap() - .addGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addComponent(splitConfig, GroupLayout.DEFAULT_SIZE, 797, Short.MAX_VALUE) - .addGroup(layout.createSequentialGroup() - .addComponent(jLabel1) - .addGap(0, 0, Short.MAX_VALUE)) - .addGroup(GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addGap(0, 0, Short.MAX_VALUE) - .addComponent(btnClose) - .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) - .addComponent(btnOpen))) - .addContainerGap()) - ); - layout.setVerticalGroup( - layout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addContainerGap() - .addComponent(jLabel1) - .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) - .addComponent(splitConfig, GroupLayout.DEFAULT_SIZE, 341, Short.MAX_VALUE) - .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(GroupLayout.Alignment.BASELINE) - .addComponent(btnOpen) - .addComponent(btnClose)) - .addContainerGap()) - ); - - pack(); + SwingUtilities.invokeLater(() -> splitConfig.setDividerLocation(270)); + + // --- Layout Construction --- + // We configure the clean structure directly on the content pane in the constructor, + // so here we return null or a dummy. + // But to respect the pattern, let's allow buildContent to assemble the pieces. + + // Center Panel: Header + SplitPane + JPanel centerPanel = new JPanel(new java.awt.BorderLayout()); + centerPanel.add(headerPanel, java.awt.BorderLayout.NORTH); + centerPanel.add(splitConfig, java.awt.BorderLayout.CENTER); + + // Buttons Panel: Bottom Right + JPanel buttonsPanel = new JPanel(new net.miginfocom.swing.MigLayout("insets 5 10 10 10, fillx", "[grow][][]", "[]")); + buttonsPanel.add(btnOpen, "align right, skip 1, split 2, tag ok, wmin 100"); + buttonsPanel.add(btnClose, "tag cancel, wmin 80"); + + // Root Container to hold both centers + JPanel root = new JPanel(new net.miginfocom.swing.MigLayout("fill, insets 0", "[grow]", "[grow]0[]")); + + root.add(centerPanel, "grow, push, wrap"); + root.add(buttonsPanel, "growx"); + return root; } private void lstConfigMouseClicked(MouseEvent evt) { @@ -201,12 +175,10 @@ private void lstConfigMouseClicked(MouseEvent evt) { } private void lstConfigValueChanged(ListSelectionEvent evt) { - Optional - .ofNullable(lstConfig.getSelectedValue()) - .ifPresentOrElse(computer -> { - Schema schema = new Schema(computer, appSettings); - preview.setSchema(schema); - }, () -> preview.setSchema(null)); + Optional.ofNullable(lstConfig.getSelectedValue()).ifPresentOrElse(computer -> { + Schema schema = new Schema(computer, appSettings); + preview.setSchema(schema); + }, () -> preview.setSchema(null)); preview.repaint(); } diff --git a/application/src/main/java/net/emustudio/application/gui/dialogs/PluginComboModel.java b/application/src/main/java/net/emustudio/application/gui/dialogs/PluginComboModel.java index 722babade..d015eed87 100644 --- a/application/src/main/java/net/emustudio/application/gui/dialogs/PluginComboModel.java +++ b/application/src/main/java/net/emustudio/application/gui/dialogs/PluginComboModel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.dialogs; diff --git a/application/src/main/java/net/emustudio/application/gui/dialogs/SchemaEditorDialog.java b/application/src/main/java/net/emustudio/application/gui/dialogs/SchemaEditorDialog.java index be4a5bfc1..d7f792ef9 100644 --- a/application/src/main/java/net/emustudio/application/gui/dialogs/SchemaEditorDialog.java +++ b/application/src/main/java/net/emustudio/application/gui/dialogs/SchemaEditorDialog.java @@ -1,16 +1,17 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.dialogs; -import net.emustudio.application.gui.ToolbarToggleButton; import net.emustudio.application.gui.schema.DrawingPanel; import net.emustudio.application.gui.schema.DrawingPanel.Tool; import net.emustudio.application.gui.schema.Schema; import net.emustudio.emulib.plugins.annotations.PLUGIN_TYPE; -import net.emustudio.emulib.runtime.interaction.Dialogs; -import net.emustudio.emulib.runtime.interaction.GuiUtils; -import net.emustudio.emulib.runtime.interaction.ToolbarButton; +import net.emustudio.emulib.runtime.ui.Dialogs; import net.emustudio.emulib.runtime.settings.CannotUpdateSettingException; +import net.emustudio.emulib.runtime.ui.GUI; +import net.emustudio.emulib.runtime.ui.components.DialogBase; +import net.emustudio.emulib.runtime.ui.components.ToolbarButton; +import net.miginfocom.swing.MigLayout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,47 +27,40 @@ import java.util.Objects; import java.util.Optional; +import static net.emustudio.application.gui.framework.EmuStudioUI.*; import static net.emustudio.application.settings.ConfigFiles.listPluginFiles; -public class SchemaEditorDialog extends JDialog implements KeyListener { +public class SchemaEditorDialog extends DialogBase implements KeyListener { private final static Logger LOGGER = LoggerFactory.getLogger(SchemaEditorDialog.class); private final static PluginComboModel EMPTY_MODEL = new PluginComboModel(Collections.emptyList()); private final Schema schema; private final Dialogs dialogs; - private DrawingPanel panel; + private final DrawingPanel panel; private boolean buttonSelected = false; - private ToolbarToggleButton btnBidirection; - private ToolbarToggleButton btnCPU; - private ToolbarToggleButton btnCompiler; - private ToolbarToggleButton btnDelete; - private ToolbarToggleButton btnDevice; - private ToolbarToggleButton btnLine; - private ToolbarToggleButton btnRAM; - private ToolbarToggleButton btnUseGrid; + private JToggleButton btnBidirection; + private JToggleButton btnCPU; + private JToggleButton btnCompiler; + private JToggleButton btnDelete; + private JToggleButton btnDevice; + private JToggleButton btnLine; + private JToggleButton btnRAM; + private JToggleButton btnUseGrid; private JComboBox cmbPlugin; private ButtonGroup groupDraw; private JScrollPane scrollScheme; private JSlider sliderGridGap; public SchemaEditorDialog(JDialog parent, Schema schema, Dialogs dialogs) { - super(parent, true); + super(parent, "Computer editor [" + schema.getComputerConfig().getName() + "]", true); this.schema = Objects.requireNonNull(schema); this.dialogs = Objects.requireNonNull(dialogs); - initialize(); - setTitle("Computer editor [" + schema.getComputerConfig().getName() + "]"); - setLocationRelativeTo(parent); - } + buildContent(); - public Schema getSchema() { - return schema; - } - - private void initialize() { - initComponents(); + // Additional initialization after buildContent is called btnUseGrid.setSelected(schema.useSchemaGrid()); panel = new DrawingPanel(this.schema); scrollScheme.setViewportView(panel); @@ -75,7 +69,7 @@ private void initialize() { sliderGridGap.setValue(schema.getSchemaGridGap()); panel.addMouseListener(panel); panel.addMouseMotionListener(panel); - GuiUtils.addKeyListener(this, this); + GUI.addKeyListenerRecursively(this, this); panel.addToolListener(() -> { panel.setTool(Tool.TOOL_NOTHING, null); @@ -106,76 +100,75 @@ public void keyPressed(KeyEvent e) { public void keyReleased(KeyEvent e) { } - private void initComponents() { + public Schema getSchema() { + return schema; + } + + @Override + protected JComponent initializeComponents() { groupDraw = new ButtonGroup(); - JToolBar toolDraw = new JToolBar(); - ToolbarButton btnSave = new ToolbarButton( + JToolBar toolDraw = GUI.toolBar(); + ToolbarButton btnSave = GUI.toolbarButton( this::btnSaveActionPerformed, - "/net/emustudio/application/gui/dialogs/document-save.png", + ICON_SAVE, "Save & Close" ); JToolBar.Separator separator1 = new JToolBar.Separator(); - btnCompiler = new ToolbarToggleButton( + btnCompiler = GUI.toolbarToggleButton( this::btnCompilerActionPerformed, this::btnCompilerItemStateChanged, - "/net/emustudio/application/gui/dialogs/compile.png", + ICON_COMPILER, "Set compiler" ); - btnCPU = new ToolbarToggleButton( + btnCPU = GUI.toolbarToggleButton( this::btnCPUActionPerformed, this::btnCPUItemStateChanged, - "/net/emustudio/application/gui/dialogs/cpu.gif", + ICON_CPU, "Set CPU" ); - btnRAM = new ToolbarToggleButton( + btnRAM = GUI.toolbarToggleButton( this::btnRAMActionPerformed, this::btnRAMItemStateChanged, - "/net/emustudio/application/gui/dialogs/ram.gif", + ICON_MEMORY, "Set operating memory" ); - btnDevice = new ToolbarToggleButton( + btnDevice = GUI.toolbarToggleButton( this::btnDeviceActionPerformed, this::btnDeviceItemStateChanged, - "/net/emustudio/application/gui/dialogs/device.png", + ICON_DEVICE, "Add device" ); JToolBar.Separator separator2 = new JToolBar.Separator(); - btnLine = new ToolbarToggleButton( + btnLine = GUI.toolbarToggleButton( this::btnLineActionPerformed, this::btnLineItemStateChanged, - "/net/emustudio/application/gui/dialogs/connection.png", + ICON_CONNECTION, "Add connection" ); - btnBidirection = new ToolbarToggleButton( + btnBidirection = GUI.toolbarToggleButton( this::btnBidirectionActionPerformed, - "/net/emustudio/application/gui/dialogs/bidirection.gif", + ICON_BIDIRECTION, "Bidirectional connection" ); JToolBar.Separator separator3 = new JToolBar.Separator(); - btnDelete = new ToolbarToggleButton( + btnDelete = GUI.toolbarToggleButton( this::btnDeleteActionPerformed, this::btnDeleteItemStateChanged, - "/net/emustudio/application/gui/dialogs/edit-delete.png", + ICON_DELETE, "Delete component or connection" ); JToolBar.Separator separator4 = new JToolBar.Separator(); cmbPlugin = new JComboBox<>(); JToolBar.Separator separator5 = new JToolBar.Separator(); - btnUseGrid = new ToolbarToggleButton( + btnUseGrid = GUI.toolbarToggleButton( this::btnUseGridActionPerformed, - "/net/emustudio/application/gui/dialogs/grid_memory.gif", + ICON_GRID, "Set/unset using grid" ); scrollScheme = new JScrollPane(); sliderGridGap = new JSlider(); - setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); - setTitle("Virtual computer editor"); - setIconImages(null); - - toolDraw.setFloatable(false); - toolDraw.setRollover(true); toolDraw.add(btnSave); toolDraw.add(separator1); @@ -215,34 +208,12 @@ private void initComponents() { sliderGridGap.setValue(30); sliderGridGap.addChangeListener(this::sliderGridGapStateChanged); - GroupLayout layout = new GroupLayout(getContentPane()); - getContentPane().setLayout(layout); - layout.setHorizontalGroup( - layout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addContainerGap() - .addGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addComponent(toolDraw, GroupLayout.DEFAULT_SIZE, 641, Short.MAX_VALUE) - .addContainerGap()) - .addGroup(layout.createSequentialGroup() - .addComponent(scrollScheme, GroupLayout.DEFAULT_SIZE, 616, Short.MAX_VALUE) - .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) - .addComponent(sliderGridGap, GroupLayout.PREFERRED_SIZE, 31, GroupLayout.PREFERRED_SIZE)))) - ); - layout.setVerticalGroup( - layout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addContainerGap() - .addComponent(toolDraw, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) - .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(GroupLayout.Alignment.TRAILING) - .addComponent(sliderGridGap, GroupLayout.DEFAULT_SIZE, 341, Short.MAX_VALUE) - .addComponent(scrollScheme, GroupLayout.DEFAULT_SIZE, 341, Short.MAX_VALUE)) - .addContainerGap()) - ); + JPanel mainPanel = new JPanel(new MigLayout("insets dialog", "[grow]", "[][grow]")); + mainPanel.add(toolDraw, "growx, wrap"); + mainPanel.add(scrollScheme, "grow"); + mainPanel.add(sliderGridGap, "w 31!"); - pack(); + return mainPanel; } private void sliderGridGapStateChanged(ChangeEvent evt) { diff --git a/application/src/main/java/net/emustudio/application/gui/dialogs/StudioFrame.java b/application/src/main/java/net/emustudio/application/gui/dialogs/StudioFrame.java index 047944b21..d128d8355 100644 --- a/application/src/main/java/net/emustudio/application/gui/dialogs/StudioFrame.java +++ b/application/src/main/java/net/emustudio/application/gui/dialogs/StudioFrame.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.dialogs; @@ -16,7 +16,7 @@ import net.emustudio.application.settings.AppSettings; import net.emustudio.application.virtualcomputer.VirtualComputer; import net.emustudio.emulib.plugins.memory.MemoryContext; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import org.fife.ui.rtextarea.RTextArea; import javax.swing.*; @@ -25,7 +25,8 @@ import java.util.Objects; import java.util.Optional; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; + public class StudioFrame extends JFrame { private final static String SOURCE_CODE_EDITOR = "Source code editor"; @@ -131,14 +132,8 @@ public void windowClosing(WindowEvent evt) { JMenuBar mainMenu = setupMainMenu(); setJMenuBar(mainMenu); - GroupLayout layout = new GroupLayout(getContentPane()); - getContentPane().setLayout(layout); - layout.setHorizontalGroup( - layout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(tabbedPane, GroupLayout.DEFAULT_SIZE, - GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)); - layout.setVerticalGroup( - layout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(tabbedPane, GroupLayout.DEFAULT_SIZE, - GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)); + getContentPane().setLayout(new net.miginfocom.swing.MigLayout("insets 0, fill", "[grow]", "[grow]")); + getContentPane().add(tabbedPane, "grow"); } private JMenuBar setupMainMenu() { diff --git a/application/src/main/java/net/emustudio/application/gui/dialogs/ViewComputerDialog.java b/application/src/main/java/net/emustudio/application/gui/dialogs/ViewComputerDialog.java index 2576a68c1..4d606a1b2 100644 --- a/application/src/main/java/net/emustudio/application/gui/dialogs/ViewComputerDialog.java +++ b/application/src/main/java/net/emustudio/application/gui/dialogs/ViewComputerDialog.java @@ -1,7 +1,8 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.dialogs; +import net.emustudio.application.gui.framework.EmuStudioUI; import net.emustudio.application.gui.schema.Schema; import net.emustudio.application.gui.schema.SchemaPreviewPanel; import net.emustudio.application.settings.AppSettings; @@ -9,30 +10,30 @@ import net.emustudio.application.virtualcomputer.VirtualComputer; import net.emustudio.emulib.plugins.Plugin; import net.emustudio.emulib.plugins.device.Device; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; +import net.emustudio.emulib.runtime.ui.GUI; +import net.emustudio.emulib.runtime.ui.components.DialogBase; +import net.miginfocom.swing.MigLayout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.swing.*; -import java.awt.event.KeyEvent; +import java.awt.Dimension; import java.util.List; import java.util.Objects; +import java.util.Optional; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.application.gui.framework.EmuStudioUI.*; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; -public class ViewComputerDialog extends JDialog { - private final static Logger LOGGER = LoggerFactory.getLogger(ViewComputerDialog.class); - private final static String ICON_COMPILER = "/net/emustudio/application/gui/dialogs/compile.png"; - private final static String ICON_CPU = "/net/emustudio/application/gui/dialogs/cpu.gif"; - private final static String ICON_MEMORY = "/net/emustudio/application/gui/dialogs/ram.gif"; - private final static String ICON_DEVICE = "/net/emustudio/application/gui/dialogs/device.png"; - private final static String ICON_SAVE = "/net/emustudio/application/gui/dialogs/document-save.png"; +public class ViewComputerDialog extends DialogBase { + private static final Logger LOGGER = LoggerFactory.getLogger(ViewComputerDialog.class); private final VirtualComputer computer; + private final List devices; private final SchemaPreviewPanel panelSchema; - private JToggleButton btnCompiler; - private JToggleButton btnDevice; - private JToggleButton btnMemory; + private final ButtonGroup pluginButtonGroup = new ButtonGroup(); + private JComboBox cmbDevice; private JLabel lblComputerName; private JLabel lblCopyright; @@ -40,338 +41,164 @@ public class ViewComputerDialog extends JDialog { private JLabel lblName; private JLabel lblSelectDevice; private JLabel lblVersion; - private JScrollPane scrollPane; private JTextArea txtDescription; + public ViewComputerDialog(JFrame parent, VirtualComputer computer, AppSettings appSettings, Dialogs dialogs) { - super(parent, true); + super(parent, "Computer information preview", true); this.computer = Objects.requireNonNull(computer); + this.devices = computer.getDevices(); + this.panelSchema = new SchemaPreviewPanel(new Schema(computer.getComputerConfig(), appSettings), dialogs); - initComponents(); - setLocationRelativeTo(parent); - + buildContent(); + setMinimumSize(new Dimension(600, 450)); + setSize(new Dimension(800, 600)); lblComputerName.setText(computer.getComputerConfig().getName()); + devices.forEach(device -> cmbDevice.addItem(device.getTitle())); - final List devices = computer.getDevices(); - for (Device device : devices) { - cmbDevice.addItem(device.getTitle()); - } - - cmbDevice.addActionListener(e -> { - int i = cmbDevice.getSelectedIndex(); - if (i < 0) { - setVisibleInfo(false); - } else { - try { - setInfo(devices.get(i), computer.getComputerConfig().getDevices().get(i)); - setVisibleInfo(true); - } catch (Exception ex) { - setVisibleInfo(false); - LOGGER.error("Could not setup plugin information", ex); - } - } - }); - - panelSchema = new SchemaPreviewPanel(new Schema(computer.getComputerConfig(), appSettings), dialogs); - scrollPane.setViewportView(panelSchema); - scrollPane.getHorizontalScrollBar().setUnitIncrement(10); - scrollPane.getVerticalScrollBar().setUnitIncrement(10); - - if (computer.getCompiler().isEmpty()) { - btnCompiler.setEnabled(false); - } - if (computer.getMemory().isEmpty()) { - btnMemory.setEnabled(false); - } - if (computer.getDevices().isEmpty()) { - btnDevice.setEnabled(false); - } - - // Select default info + // Select default info (CPU) lblSelectDevice.setVisible(false); cmbDevice.setVisible(false); - computer.getComputerConfig().getCPU().ifPresent( - conf -> computer.getCPU().ifPresent(cpu -> setInfo(cpu, conf)) - ); + showPluginInfo(computer.getCPU(), computer.getComputerConfig().getCPU()); } - private void setInfo(Plugin plugin, PluginConfig config) { - lblName.setText(plugin.getTitle()); - lblVersion.setText(plugin.getVersion()); - lblFileName.setText(config.getPluginFile()); - lblCopyright.setText(plugin.getCopyright()); - txtDescription.setText(plugin.getDescription()); - } - - private void setVisibleInfo(boolean visible) { - if (!visible) { + private void showPluginInfo(Optional plugin, Optional config) { + if (plugin.isPresent() && config.isPresent()) { + Plugin p = plugin.get(); + PluginConfig c = config.get(); + lblName.setText(p.getTitle()); + lblVersion.setText(p.getVersion()); + lblFileName.setText(c.getPluginFile()); + lblCopyright.setText(p.getCopyright()); + txtDescription.setText(p.getDescription()); + lblCopyright.setVisible(true); + lblVersion.setVisible(true); + lblFileName.setVisible(true); + txtDescription.setVisible(true); + } else { lblName.setText("Plug-in is not available. Please select another one."); + lblCopyright.setVisible(false); + lblVersion.setVisible(false); + lblFileName.setVisible(false); + txtDescription.setVisible(false); } - lblCopyright.setVisible(visible); - lblVersion.setVisible(visible); - lblFileName.setVisible(visible); - txtDescription.setVisible(visible); } - private void initComponents() { - ButtonGroup buttonGroup1 = new ButtonGroup(); - lblComputerName = new JLabel(); - JTabbedPane jTabbedPane1 = new JTabbedPane(); - JPanel panelTabInfo = new JPanel(); - JToolBar jToolBar1 = new JToolBar(); - btnCompiler = new JToggleButton(loadIcon(ICON_COMPILER)); - JToggleButton btnCPU = new JToggleButton(loadIcon(ICON_CPU)); - btnMemory = new JToggleButton(loadIcon(ICON_MEMORY)); - btnDevice = new JToggleButton(loadIcon(ICON_DEVICE)); - JPanel jPanel2 = new JPanel(); - lblSelectDevice = new JLabel(); - cmbDevice = new JComboBox<>(); - lblName = new JLabel(); - lblFileName = new JLabel(); - lblVersion = new JLabel(); - lblCopyright = new JLabel(); - JPanel panelDescription = new JPanel(); - JScrollPane jScrollPane1 = new JScrollPane(); - txtDescription = new JTextArea(); - JPanel jPanel1 = new JPanel(); - JToolBar jToolBar2 = new JToolBar(); - JButton btnSaveSchema = new JButton(loadIcon(ICON_SAVE)); - scrollPane = new JScrollPane(); - - setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); - getRootPane().registerKeyboardAction(e -> dispose(), KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_IN_FOCUSED_WINDOW); - - setTitle("Computer information preview"); - - lblComputerName.setFont(lblComputerName.getFont().deriveFont(lblComputerName.getFont().getStyle() | java.awt.Font.BOLD, lblComputerName.getFont().getSize() + 3)); + @Override + protected JComponent initializeComponents() { + lblComputerName = GUI.titleLabel("computer_name"); lblComputerName.setHorizontalAlignment(SwingConstants.CENTER); - lblComputerName.setText("computer_name"); - - jToolBar1.setFloatable(false); - jToolBar1.setOrientation(SwingConstants.VERTICAL); - jToolBar1.setRollover(true); - jToolBar1.setDoubleBuffered(true); - - buttonGroup1.add(btnCompiler); - btnCompiler.setToolTipText("Compiler information"); - btnCompiler.setFocusable(false); - btnCompiler.addActionListener(this::btnCompilerActionPerformed); - jToolBar1.add(btnCompiler); - - buttonGroup1.add(btnCPU); - btnCPU.setSelected(true); - btnCPU.setToolTipText("CPU information"); - btnCPU.setFocusable(false); - btnCPU.addActionListener(this::btnCPUActionPerformed); - jToolBar1.add(btnCPU); - - buttonGroup1.add(btnMemory); - btnMemory.setToolTipText("Memory information"); - btnMemory.setFocusable(false); - btnMemory.addActionListener(this::btnMemoryActionPerformed); - jToolBar1.add(btnMemory); - - buttonGroup1.add(btnDevice); - btnDevice.setToolTipText("Devices information"); - btnDevice.setFocusable(false); - btnDevice.addActionListener(this::btnDeviceActionPerformed); - jToolBar1.add(btnDevice); - - lblSelectDevice.setText("Select device:"); - - lblName.setFont(lblName.getFont().deriveFont(lblName.getFont().getStyle() | java.awt.Font.BOLD)); - lblName.setText("plugin_name"); - - lblFileName.setText("plugin_file_name"); - lblVersion.setText("plugin_version"); - lblCopyright.setText("plugin_copyright"); - panelDescription.setBorder(BorderFactory.createTitledBorder("Short description")); + lblSelectDevice = GUI.label("Select device:"); + cmbDevice = new JComboBox<>(); + lblName = GUI.boldLabel(""); + lblFileName = GUI.label(""); + lblVersion = GUI.label(""); + lblCopyright = GUI.label(""); - txtDescription.setColumns(20); + txtDescription = EmuStudioUI.textArea(5, 20); txtDescription.setEditable(false); - txtDescription.setLineWrap(true); - txtDescription.setRows(5); - txtDescription.setWrapStyleWord(true); - jScrollPane1.setViewportView(txtDescription); - - GroupLayout panelDescriptionLayout = new GroupLayout(panelDescription); - panelDescription.setLayout(panelDescriptionLayout); - panelDescriptionLayout.setHorizontalGroup( - panelDescriptionLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(panelDescriptionLayout.createSequentialGroup() - .addContainerGap() - .addComponent(jScrollPane1) - .addContainerGap()) - ); - panelDescriptionLayout.setVerticalGroup( - panelDescriptionLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(panelDescriptionLayout.createSequentialGroup() - .addComponent(jScrollPane1) - .addContainerGap()) - ); - - GroupLayout jPanel2Layout = new GroupLayout(jPanel2); - jPanel2.setLayout(jPanel2Layout); - jPanel2Layout.setHorizontalGroup( - jPanel2Layout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(jPanel2Layout.createSequentialGroup() - .addContainerGap() - .addGroup(jPanel2Layout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addComponent(panelDescription, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGroup(jPanel2Layout.createSequentialGroup() - .addComponent(lblSelectDevice) - .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) - .addComponent(cmbDevice, 0, 377, Short.MAX_VALUE)) - .addGroup(jPanel2Layout.createSequentialGroup() - .addGroup(jPanel2Layout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addComponent(lblName) - .addComponent(lblVersion) - .addComponent(lblCopyright) - .addComponent(lblFileName)) - .addGap(0, 0, Short.MAX_VALUE))) - .addContainerGap()) - ); - jPanel2Layout.setVerticalGroup( - jPanel2Layout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(jPanel2Layout.createSequentialGroup() - .addContainerGap() - .addGroup(jPanel2Layout.createParallelGroup(GroupLayout.Alignment.BASELINE) - .addComponent(lblSelectDevice) - .addComponent(cmbDevice, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)) - .addGap(18, 18, 18) - .addComponent(lblName) - .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) - .addComponent(lblFileName) - .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(lblVersion) - .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) - .addComponent(lblCopyright) - .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(panelDescription, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addContainerGap()) - ); - - GroupLayout panelTabInfoLayout = new GroupLayout(panelTabInfo); - panelTabInfo.setLayout(panelTabInfoLayout); - panelTabInfoLayout.setHorizontalGroup( - panelTabInfoLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(panelTabInfoLayout.createSequentialGroup() - .addContainerGap() - .addComponent(jToolBar1, GroupLayout.PREFERRED_SIZE, 43, GroupLayout.PREFERRED_SIZE) - .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jPanel2, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addContainerGap()) - ); - panelTabInfoLayout.setVerticalGroup( - panelTabInfoLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(panelTabInfoLayout.createSequentialGroup() - .addContainerGap() - .addGroup(panelTabInfoLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addComponent(jToolBar1, GroupLayout.DEFAULT_SIZE, 280, Short.MAX_VALUE) - .addComponent(jPanel2, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addContainerGap()) - ); - - jTabbedPane1.addTab("Computer info", panelTabInfo); - - jToolBar2.setFloatable(false); - jToolBar2.setOrientation(SwingConstants.VERTICAL); - jToolBar2.setRollover(true); - - btnSaveSchema.setToolTipText("Save schema image"); - btnSaveSchema.setFocusable(false); - btnSaveSchema.setHorizontalTextPosition(SwingConstants.CENTER); - btnSaveSchema.setVerticalTextPosition(SwingConstants.BOTTOM); - btnSaveSchema.addActionListener(this::btnSaveSchemaActionPerformed); - jToolBar2.add(btnSaveSchema); - - GroupLayout jPanel1Layout = new GroupLayout(jPanel1); - jPanel1.setLayout(jPanel1Layout); - jPanel1Layout.setHorizontalGroup( - jPanel1Layout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(jPanel1Layout.createSequentialGroup() - .addContainerGap() - .addComponent(jToolBar2, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) - .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) - .addComponent(scrollPane, GroupLayout.DEFAULT_SIZE, 505, Short.MAX_VALUE) - .addContainerGap()) - ); - jPanel1Layout.setVerticalGroup( - jPanel1Layout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup() - .addContainerGap() - .addGroup(jPanel1Layout.createParallelGroup(GroupLayout.Alignment.TRAILING) - .addComponent(scrollPane) - .addComponent(jToolBar2, GroupLayout.DEFAULT_SIZE, 280, Short.MAX_VALUE)) - .addContainerGap()) - ); - - jTabbedPane1.addTab("Abstract schema", jPanel1); - GroupLayout layout = new GroupLayout(getContentPane()); - getContentPane().setLayout(layout); - layout.setHorizontalGroup( - layout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addContainerGap() - .addGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addComponent(jTabbedPane1) - .addComponent(lblComputerName, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addContainerGap()) - ); - layout.setVerticalGroup( - layout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addGap(6, 6, 6) - .addComponent(lblComputerName) - .addGap(18, 18, 18) - .addComponent(jTabbedPane1) - .addContainerGap()) - ); - - pack(); - } - - private void btnCompilerActionPerformed(java.awt.event.ActionEvent evt) { - lblSelectDevice.setVisible(false); - cmbDevice.setVisible(false); - computer.getComputerConfig().getCompiler().ifPresent( - conf -> computer.getCompiler().ifPresent(compiler -> setInfo(compiler, conf)) - ); - } - - private void btnCPUActionPerformed(java.awt.event.ActionEvent evt) { - lblSelectDevice.setVisible(false); - cmbDevice.setVisible(false); - computer.getComputerConfig().getCPU().ifPresent( - conf -> computer.getCPU().ifPresent(cpu -> setInfo(cpu, conf)) - ); - } - - private void btnMemoryActionPerformed(java.awt.event.ActionEvent evt) { - lblSelectDevice.setVisible(false); - cmbDevice.setVisible(false); - computer.getComputerConfig().getMemory().ifPresent( - conf -> computer.getMemory().ifPresent(memory -> setInfo(memory, conf)) - ); - } + cmbDevice.addActionListener(e -> { + int index = cmbDevice.getSelectedIndex(); + if (index >= 0 && index < devices.size()) { + try { + showPluginInfo(Optional.of(devices.get(index)), + Optional.of(computer.getComputerConfig().getDevices().get(index))); + } catch (Exception ex) { + showPluginInfo(Optional.empty(), Optional.empty()); + LOGGER.error("Could not setup plugin information", ex); + } + } else { + showPluginInfo(Optional.empty(), Optional.empty()); + } + }); - private void btnDeviceActionPerformed(java.awt.event.ActionEvent evt) { - lblSelectDevice.setVisible(true); - cmbDevice.setVisible(true); - setVisibleInfo(false); - if (cmbDevice.getItemCount() > 0) { - cmbDevice.setSelectedIndex(0); - PluginConfig conf = computer.getComputerConfig().getDevices().get(0); - Device device = computer.getDevices().get(0); - setInfo(device, conf); - setVisibleInfo(true); - } else { - cmbDevice.setEnabled(false); - } + // Info tab toolbar + JToolBar infoToolbar = GUI.toolBar(); + infoToolbar.setOrientation(SwingConstants.VERTICAL); + + infoToolbar.add(createToggleButton(ICON_COMPILER, "Compiler information", false, + computer.getCompiler().isPresent(), () -> { + lblSelectDevice.setVisible(false); + cmbDevice.setVisible(false); + showPluginInfo(computer.getCompiler(), computer.getComputerConfig().getCompiler()); + })); + infoToolbar.add(createToggleButton(ICON_CPU, "CPU information", true, true, () -> { + lblSelectDevice.setVisible(false); + cmbDevice.setVisible(false); + showPluginInfo(computer.getCPU(), computer.getComputerConfig().getCPU()); + })); + infoToolbar.add(createToggleButton(ICON_MEMORY, "Memory information", false, + computer.getMemory().isPresent(), () -> { + lblSelectDevice.setVisible(false); + cmbDevice.setVisible(false); + showPluginInfo(computer.getMemory(), computer.getComputerConfig().getMemory()); + })); + infoToolbar.add(createToggleButton(ICON_DEVICE, "Devices information", false, + !devices.isEmpty(), () -> { + lblSelectDevice.setVisible(true); + cmbDevice.setVisible(true); + if (cmbDevice.getItemCount() > 0) { + cmbDevice.setSelectedIndex(0); + } else { + cmbDevice.setEnabled(false); + showPluginInfo(Optional.empty(), Optional.empty()); + } + })); + + JPanel descriptionPanel = new JPanel(new MigLayout("insets dialog", "[grow]", "[grow]")); + EmuStudioUI.stylePanel(descriptionPanel, "Short description"); + descriptionPanel.add(new JScrollPane(txtDescription), "grow"); + + JPanel infoPanel = new JPanel(new MigLayout("insets dialog", "[grow]", "[][][][][][grow]")); + infoPanel.add(lblSelectDevice, "split 2"); + infoPanel.add(cmbDevice, "grow, wrap"); + infoPanel.add(lblName, "wrap"); + infoPanel.add(lblFileName, "wrap"); + infoPanel.add(lblVersion, "wrap"); + infoPanel.add(lblCopyright, "wrap"); + infoPanel.add(descriptionPanel, "grow"); + + JPanel infoTab = new JPanel(new MigLayout("insets dialog", "[][grow]", "[grow]")); + infoTab.add(infoToolbar, "grow"); + infoTab.add(infoPanel, "grow"); + + // Schema tab + JToolBar schemaToolbar = GUI.toolBar(); + schemaToolbar.setOrientation(SwingConstants.VERTICAL); + + JButton btnSave = new JButton(loadIcon(ICON_SAVE)); + btnSave.setToolTipText("Save schema image"); + btnSave.setFocusable(false); + btnSave.addActionListener(e -> panelSchema.saveSchemaImage()); + schemaToolbar.add(btnSave); + + JScrollPane scrollPane = GUI.scrollPane(panelSchema); + + JPanel schemaTab = new JPanel(new MigLayout("insets dialog", "[][grow]", "[grow]")); + schemaTab.add(schemaToolbar, "grow"); + schemaTab.add(scrollPane, "grow"); + + // Main panel + JTabbedPane tabbedPane = new JTabbedPane(); + tabbedPane.addTab("Computer info", infoTab); + tabbedPane.addTab("Abstract schema", schemaTab); + + JPanel mainPanel = new JPanel(new MigLayout("insets dialog", "[grow]", "[][grow]")); + mainPanel.add(lblComputerName, "growx, wrap"); + mainPanel.add(tabbedPane, "grow"); + return mainPanel; } - private void btnSaveSchemaActionPerformed(java.awt.event.ActionEvent evt) { - panelSchema.saveSchemaImage(); + private JToggleButton createToggleButton(String icon, String tooltip, boolean selected, + boolean enabled, Runnable action) { + JToggleButton button = new JToggleButton(loadIcon(icon)); + button.setToolTipText(tooltip); + button.setFocusable(false); + button.setSelected(selected); + button.setEnabled(enabled); + button.addActionListener(e -> action.run()); + pluginButtonGroup.add(button); + return button; } } diff --git a/application/src/main/java/net/emustudio/application/gui/editor/Editor.java b/application/src/main/java/net/emustudio/application/gui/editor/Editor.java index b211aaa49..f81d1e9f1 100644 --- a/application/src/main/java/net/emustudio/application/gui/editor/Editor.java +++ b/application/src/main/java/net/emustudio/application/gui/editor/Editor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.editor; diff --git a/application/src/main/java/net/emustudio/application/gui/editor/REditor.java b/application/src/main/java/net/emustudio/application/gui/editor/REditor.java index acef02aa4..6683d1f91 100644 --- a/application/src/main/java/net/emustudio/application/gui/editor/REditor.java +++ b/application/src/main/java/net/emustudio/application/gui/editor/REditor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.editor; @@ -6,8 +6,8 @@ import net.emustudio.emulib.plugins.compiler.Compiler; import net.emustudio.emulib.plugins.compiler.FileExtension; import net.emustudio.emulib.plugins.compiler.SourceCodePosition; -import net.emustudio.emulib.runtime.interaction.Dialogs; -import net.emustudio.emulib.runtime.interaction.FileExtensionsFilter; +import net.emustudio.emulib.runtime.ui.Dialogs; +import net.emustudio.emulib.runtime.ui.components.FileExtensionsFilter; import org.fife.io.UnicodeWriter; import org.fife.rsta.ui.search.SearchEvent; import org.fife.ui.rsyntaxtextarea.*; @@ -31,7 +31,7 @@ import static java.awt.event.InputEvent.CTRL_DOWN_MASK; import static net.emustudio.application.Constants.FONT_CODE; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.FONT_DEFAULT_SIZE; +import static net.emustudio.emulib.runtime.ui.Constants.FONT_DEFAULT_SIZE; public class REditor implements Editor { private final static Logger LOGGER = LoggerFactory.getLogger(REditor.class); @@ -202,7 +202,7 @@ public boolean openFile() { .map(FileExtension::getExtension) .collect(Collectors.toList()); - if (sourceExtensions.size() > 0) { + if (!sourceExtensions.isEmpty()) { filters.add(new FileExtensionsFilter("All source files", sourceExtensions)); } diff --git a/application/src/main/java/net/emustudio/application/gui/editor/RTokenMaker.java b/application/src/main/java/net/emustudio/application/gui/editor/RTokenMaker.java index cff1fd98b..23e48e4d4 100644 --- a/application/src/main/java/net/emustudio/application/gui/editor/RTokenMaker.java +++ b/application/src/main/java/net/emustudio/application/gui/editor/RTokenMaker.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.editor; diff --git a/application/src/main/java/net/emustudio/application/gui/editor/RTokenMakerWrapper.java b/application/src/main/java/net/emustudio/application/gui/editor/RTokenMakerWrapper.java index aba2761ea..8675bc268 100644 --- a/application/src/main/java/net/emustudio/application/gui/editor/RTokenMakerWrapper.java +++ b/application/src/main/java/net/emustudio/application/gui/editor/RTokenMakerWrapper.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.editor; diff --git a/application/src/main/java/net/emustudio/application/gui/framework/EmuStudioUI.java b/application/src/main/java/net/emustudio/application/gui/framework/EmuStudioUI.java new file mode 100644 index 000000000..99f6e716d --- /dev/null +++ b/application/src/main/java/net/emustudio/application/gui/framework/EmuStudioUI.java @@ -0,0 +1,200 @@ +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo + SPDX-License-Identifier: GPL-3.0-or-later */ +package net.emustudio.application.gui.framework; + +import com.formdev.flatlaf.FlatDarkLaf; +import com.formdev.flatlaf.FlatIntelliJLaf; +import com.formdev.flatlaf.FlatLightLaf; + +import javax.swing.*; +import java.awt.*; + +import net.emustudio.application.settings.AppSettings; +import net.emustudio.emulib.runtime.ui.components.FadingBorder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static net.emustudio.emulib.runtime.ui.Constants.*; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; + +/** + * Central UI configuration for emuStudio. + * Provides theme management and common UI utilities. + */ +public class EmuStudioUI { + public static final String LOGO_FILE = "/net/emustudio/application/gui/dialogs/logo.png"; + public static final String ICON_COMPILER = "/net/emustudio/application/gui/dialogs/compile.png"; + public static final String ICON_CPU = "/net/emustudio/application/gui/dialogs/cpu.gif"; + public static final String ICON_MEMORY = "/net/emustudio/application/gui/dialogs/ram.gif"; + public static final String ICON_DEVICE = "/net/emustudio/application/gui/dialogs/device.png"; + public static final String ICON_SAVE = "/net/emustudio/application/gui/dialogs/document-save.png"; + public static final String ICON_CONNECTION = "/net/emustudio/application/gui/dialogs/connection.png"; + public static final String ICON_BIDIRECTION = "/net/emustudio/application/gui/dialogs/bidirection.gif"; + public static final String ICON_DELETE = "/net/emustudio/application/gui/dialogs/edit-delete.png"; + public static final String ICON_GRID = "/net/emustudio/application/gui/dialogs/grid_memory.gif"; + + private static final Logger LOGGER = LoggerFactory.getLogger(EmuStudioUI.class); + + private static AppSettings.Theme currentTheme = AppSettings.Theme.INTELLIJ; + + public static void initialize(AppSettings config) { + AppSettings.Theme theme = config.getTheme().orElse(AppSettings.Theme.INTELLIJ); + try { + switch (theme) { + case LIGHT: + FlatLightLaf.setup(); + break; + case DARK: + FlatDarkLaf.setup(); + break; + case INTELLIJ: + default: + FlatIntelliJLaf.setup(); + break; + } + currentTheme = theme; + customize(); + } catch (Exception e) { + LOGGER.error("Failed to initialize FlatLaf: " + e.getMessage(), e); + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (Exception ex) { + LOGGER.error("Failed to set look and feel after FlatLaf failure: " + e.getMessage(), e); + } + } + } + + private static void customize() { + // Additional UI tweaks + UIManager.put("Button.arc", 8); + UIManager.put("Component.arc", 8); + UIManager.put("TextComponent.arc", 8); + + // Keep font settings for compatibility + UIManager.put("Button.font", FONT_COMMON); + UIManager.put("Button.opaque", true); + + UIManager.put("CheckBox.font", FONT_COMMON); + UIManager.put("CheckBoxMenuItem.font", FONT_COMMON); + UIManager.put("CheckBoxMenuItem.acceleratorFont", FONT_COMMON); + + UIManager.put("ColorChooser.font", FONT_COMMON); + UIManager.put("ComboBox.font", FONT_COMMON); + + UIManager.put("TabbedPane.selected", UIManager.get("Panel.background")); + UIManager.put("TabbedPane.background", UIManager.get("Panel.background")); + UIManager.put("TabbedPane.contentAreaColor", UIManager.get("Panel.background")); + UIManager.put("TabbedPane.contentOpaque", true); + UIManager.put("TabbedPane.opaque", true); + UIManager.put("TabbedPane.tabsOpaque", true); + UIManager.put("TabbedPane.font", FONT_TITLE_BORDER); + UIManager.put("TabbedPane.smallFont", FONT_COMMON); + + UIManager.put("EditorPane.font", FONT_MONOSPACED); + UIManager.put("FormattedTextField.font", FONT_COMMON); + UIManager.put("IconButton.font", FONT_COMMON); + + UIManager.put("InternalFrame.optionDialogTitleFont", FONT_TITLE_BORDER); + UIManager.put("InternalFrame.paletteTitleFont", FONT_TITLE_BORDER); + UIManager.put("InternalFrame.titleFont", FONT_TITLE_BORDER); + UIManager.put("InternalFrame.opaque", true); + + UIManager.put("Label.font", FONT_COMMON); + UIManager.put("Label.opaque", true); + + UIManager.put("List.font", FONT_MONOSPACED); + UIManager.put("List.rendererUseUIBorder", true); + UIManager.put("List.focusCellHighlightBorder", null); + + UIManager.put("Menu.acceleratorFont", FONT_COMMON); + UIManager.put("Menu.font", FONT_COMMON); + + UIManager.put("MenuBar.font", FONT_COMMON); + + UIManager.put("MenuItem.acceleratorFont", FONT_COMMON); + UIManager.put("MenuItem.font", FONT_COMMON); + + UIManager.put("OptionPane.buttonFont", FONT_COMMON); + UIManager.put("OptionPane.font", FONT_COMMON); + UIManager.put("OptionPane.messageFont", FONT_COMMON); + + UIManager.put("Panel.font", FONT_COMMON); + UIManager.put("Panel.opaque", true); + + UIManager.put("PasswordField.font", FONT_COMMON); + UIManager.put("PopupMenu.font", FONT_COMMON); + UIManager.put("ProgressBar.font", FONT_COMMON); + UIManager.put("RadioButton.font", FONT_COMMON); + UIManager.put("RadioButtonMenuItem.acceleratorFont", FONT_COMMON); + UIManager.put("RadioButtonMenuItem.font", FONT_COMMON); + UIManager.put("ScrollPane.font", FONT_COMMON); + UIManager.put("Slider.font", FONT_COMMON); + UIManager.put("Spinner.font", FONT_COMMON); + + UIManager.put("Table.font", FONT_COMMON); + UIManager.put("Table.focusCellHighlightBorder", null); + + UIManager.put("TableHeader.font", FONT_TITLE_BORDER); + + UIManager.put("TextArea.font", FONT_MONOSPACED); + UIManager.put("TextField.font", FONT_MONOSPACED); + UIManager.put("TextPane.font", FONT_MONOSPACED); + UIManager.put("TitledBorder.font", FONT_TITLE_BORDER); + UIManager.put("ToggleButton.font", FONT_COMMON); + UIManager.put("ToolBar.font", FONT_COMMON); + UIManager.put("ToolTip.font", FONT_COMMON); + UIManager.put("Tree.font", FONT_COMMON); + UIManager.put("Viewport.font", FONT_COMMON); + } + + + public static void setTheme(AppSettings config) { + initialize(config); + + // Update all windows + for (Window window : Window.getWindows()) { + SwingUtilities.updateComponentTreeUI(window); + } + } + + public static AppSettings.Theme getCurrentTheme() { + return currentTheme; + } + + // Common UI factory methods + public static JTextArea textArea(int rows, int cols) { + JTextArea area = new JTextArea(rows, cols); + area.setLineWrap(true); + area.setWrapStyleWord(true); + return area; + } + + /** + * Apply modern styled border to a panel. + */ + public static void stylePanel(JPanel panel, String title) { + if (title != null && !title.isEmpty()) { + panel.setBorder(BorderFactory.createTitledBorder(title)); + } + } + + /** + * Apply rounded corners to a component. + */ + public static void applyRoundedCorners(JComponent component) { + component.putClientProperty("JComponent.roundRect", true); + } + + /** + * Create a JLabel with the emuStudio logo, styled with a fading border. + * + * @return JLabel containing the logo + */ + public static JLabel createLogoJLabel() { + JLabel lblLogo = new JLabel(loadIcon(LOGO_FILE)); + lblLogo.setBackground(Color.WHITE); + lblLogo.setBorder(new FadingBorder(10, Color.WHITE)); + lblLogo.setOpaque(false); + return lblLogo; + } +} diff --git a/application/src/main/java/net/emustudio/application/gui/ExtendedDialogs.java b/application/src/main/java/net/emustudio/application/gui/framework/ExtendedDialogs.java similarity index 54% rename from application/src/main/java/net/emustudio/application/gui/ExtendedDialogs.java rename to application/src/main/java/net/emustudio/application/gui/framework/ExtendedDialogs.java index 795db6678..a204ea041 100644 --- a/application/src/main/java/net/emustudio/application/gui/ExtendedDialogs.java +++ b/application/src/main/java/net/emustudio/application/gui/framework/ExtendedDialogs.java @@ -1,8 +1,8 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ -package net.emustudio.application.gui; +package net.emustudio.application.gui.framework; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import java.awt.*; diff --git a/application/src/main/java/net/emustudio/application/gui/GuiDialogsImpl.java b/application/src/main/java/net/emustudio/application/gui/framework/GuiDialogsImpl.java similarity index 97% rename from application/src/main/java/net/emustudio/application/gui/GuiDialogsImpl.java rename to application/src/main/java/net/emustudio/application/gui/framework/GuiDialogsImpl.java index e88a06e39..78de71747 100644 --- a/application/src/main/java/net/emustudio/application/gui/GuiDialogsImpl.java +++ b/application/src/main/java/net/emustudio/application/gui/framework/GuiDialogsImpl.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ -package net.emustudio.application.gui; +package net.emustudio.application.gui.framework; import net.emustudio.emulib.runtime.helpers.RadixUtils; -import net.emustudio.emulib.runtime.interaction.FileExtensionsFilter; +import net.emustudio.emulib.runtime.ui.components.FileExtensionsFilter; import javax.swing.*; import javax.swing.filechooser.FileFilter; diff --git a/application/src/main/java/net/emustudio/application/gui/NoGuiDialogsImpl.java b/application/src/main/java/net/emustudio/application/gui/framework/NoGuiDialogsImpl.java similarity index 95% rename from application/src/main/java/net/emustudio/application/gui/NoGuiDialogsImpl.java rename to application/src/main/java/net/emustudio/application/gui/framework/NoGuiDialogsImpl.java index 9acefdbee..9129b2c70 100644 --- a/application/src/main/java/net/emustudio/application/gui/NoGuiDialogsImpl.java +++ b/application/src/main/java/net/emustudio/application/gui/framework/NoGuiDialogsImpl.java @@ -1,8 +1,8 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ -package net.emustudio.application.gui; +package net.emustudio.application.gui.framework; -import net.emustudio.emulib.runtime.interaction.FileExtensionsFilter; +import net.emustudio.emulib.runtime.ui.components.FileExtensionsFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/net/emustudio/application/gui/P.java b/application/src/main/java/net/emustudio/application/gui/framework/P.java similarity index 92% rename from application/src/main/java/net/emustudio/application/gui/P.java rename to application/src/main/java/net/emustudio/application/gui/framework/P.java index c77a02d00..42e1b40c5 100644 --- a/application/src/main/java/net/emustudio/application/gui/P.java +++ b/application/src/main/java/net/emustudio/application/gui/framework/P.java @@ -1,6 +1,6 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ -package net.emustudio.application.gui; +package net.emustudio.application.gui.framework; import net.emustudio.application.settings.SchemaPoint; diff --git a/application/src/main/java/net/emustudio/application/gui/schema/DrawingModel.java b/application/src/main/java/net/emustudio/application/gui/schema/DrawingModel.java index 7e774438f..46fbdf74b 100644 --- a/application/src/main/java/net/emustudio/application/gui/schema/DrawingModel.java +++ b/application/src/main/java/net/emustudio/application/gui/schema/DrawingModel.java @@ -1,8 +1,8 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.schema; -import net.emustudio.application.gui.P; +import net.emustudio.application.gui.framework.P; import net.emustudio.application.gui.schema.elements.ConnectionLine; import net.emustudio.application.gui.schema.elements.Element; diff --git a/application/src/main/java/net/emustudio/application/gui/schema/DrawingPanel.java b/application/src/main/java/net/emustudio/application/gui/schema/DrawingPanel.java index 8e77c37e6..ea8e17c57 100644 --- a/application/src/main/java/net/emustudio/application/gui/schema/DrawingPanel.java +++ b/application/src/main/java/net/emustudio/application/gui/schema/DrawingPanel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ /* * KISS, YAGNI, DRY @@ -19,7 +19,7 @@ */ package net.emustudio.application.gui.schema; -import net.emustudio.application.gui.P; +import net.emustudio.application.gui.framework.P; import net.emustudio.application.gui.schema.elements.ConnectionLine; import net.emustudio.application.gui.schema.elements.Element; import net.emustudio.application.gui.schema.mode.ModeSelector; diff --git a/application/src/main/java/net/emustudio/application/gui/schema/Schema.java b/application/src/main/java/net/emustudio/application/gui/schema/Schema.java index 84dad5a6b..76c4bb04d 100644 --- a/application/src/main/java/net/emustudio/application/gui/schema/Schema.java +++ b/application/src/main/java/net/emustudio/application/gui/schema/Schema.java @@ -1,8 +1,8 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.schema; -import net.emustudio.application.gui.P; +import net.emustudio.application.gui.framework.P; import net.emustudio.application.gui.schema.elements.*; import net.emustudio.application.settings.AppSettings; import net.emustudio.application.settings.ComputerConfig; diff --git a/application/src/main/java/net/emustudio/application/gui/schema/SchemaPreviewPanel.java b/application/src/main/java/net/emustudio/application/gui/schema/SchemaPreviewPanel.java index f78062248..a94c7dd10 100644 --- a/application/src/main/java/net/emustudio/application/gui/schema/SchemaPreviewPanel.java +++ b/application/src/main/java/net/emustudio/application/gui/schema/SchemaPreviewPanel.java @@ -1,12 +1,12 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.schema; -import net.emustudio.application.gui.P; +import net.emustudio.application.gui.framework.P; import net.emustudio.application.gui.schema.elements.ConnectionLine; import net.emustudio.application.gui.schema.elements.Element; -import net.emustudio.emulib.runtime.interaction.Dialogs; -import net.emustudio.emulib.runtime.interaction.FileExtensionsFilter; +import net.emustudio.emulib.runtime.ui.Dialogs; +import net.emustudio.emulib.runtime.ui.components.FileExtensionsFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,6 +58,14 @@ public void setSchema(Schema schema) { panelResized = false; } + @Override + public Dimension getPreferredSize() { + if (panelResized && schemaWidth > 0 && schemaHeight > 0) { + return new Dimension(schemaWidth, schemaHeight); + } + return super.getPreferredSize(); + } + @Override public void paintComponent(Graphics g) { super.paintComponent(g); diff --git a/application/src/main/java/net/emustudio/application/gui/schema/elements/CompilerElement.java b/application/src/main/java/net/emustudio/application/gui/schema/elements/CompilerElement.java index 4cee10b50..476500af8 100644 --- a/application/src/main/java/net/emustudio/application/gui/schema/elements/CompilerElement.java +++ b/application/src/main/java/net/emustudio/application/gui/schema/elements/CompilerElement.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.schema.elements; import com.electronwill.nightconfig.core.Config; -import net.emustudio.application.gui.P; +import net.emustudio.application.gui.framework.P; import net.emustudio.application.settings.PluginConfig; import net.emustudio.emulib.plugins.annotations.PLUGIN_TYPE; diff --git a/application/src/main/java/net/emustudio/application/gui/schema/elements/ConnectionLine.java b/application/src/main/java/net/emustudio/application/gui/schema/elements/ConnectionLine.java index b21985d65..37d124294 100644 --- a/application/src/main/java/net/emustudio/application/gui/schema/elements/ConnectionLine.java +++ b/application/src/main/java/net/emustudio/application/gui/schema/elements/ConnectionLine.java @@ -1,8 +1,8 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.schema.elements; -import net.emustudio.application.gui.P; +import net.emustudio.application.gui.framework.P; import net.emustudio.application.gui.schema.Schema; import net.emustudio.application.settings.PluginConnection; import net.emustudio.application.settings.SchemaPoint; diff --git a/application/src/main/java/net/emustudio/application/gui/schema/elements/CpuElement.java b/application/src/main/java/net/emustudio/application/gui/schema/elements/CpuElement.java index 19f3091f0..406b16db6 100644 --- a/application/src/main/java/net/emustudio/application/gui/schema/elements/CpuElement.java +++ b/application/src/main/java/net/emustudio/application/gui/schema/elements/CpuElement.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.schema.elements; import com.electronwill.nightconfig.core.Config; -import net.emustudio.application.gui.P; +import net.emustudio.application.gui.framework.P; import net.emustudio.application.settings.PluginConfig; import net.emustudio.emulib.plugins.annotations.PLUGIN_TYPE; diff --git a/application/src/main/java/net/emustudio/application/gui/schema/elements/DeviceElement.java b/application/src/main/java/net/emustudio/application/gui/schema/elements/DeviceElement.java index 036a7390a..fa1225067 100644 --- a/application/src/main/java/net/emustudio/application/gui/schema/elements/DeviceElement.java +++ b/application/src/main/java/net/emustudio/application/gui/schema/elements/DeviceElement.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.schema.elements; import com.electronwill.nightconfig.core.Config; -import net.emustudio.application.gui.P; +import net.emustudio.application.gui.framework.P; import net.emustudio.application.settings.PluginConfig; import net.emustudio.emulib.plugins.annotations.PLUGIN_TYPE; diff --git a/application/src/main/java/net/emustudio/application/gui/schema/elements/Element.java b/application/src/main/java/net/emustudio/application/gui/schema/elements/Element.java index 316bca5fd..83b622690 100644 --- a/application/src/main/java/net/emustudio/application/gui/schema/elements/Element.java +++ b/application/src/main/java/net/emustudio/application/gui/schema/elements/Element.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.schema.elements; import com.electronwill.nightconfig.core.Config; -import net.emustudio.application.gui.P; +import net.emustudio.application.gui.framework.P; import net.emustudio.application.settings.PluginConfig; import net.emustudio.emulib.plugins.annotations.PLUGIN_TYPE; diff --git a/application/src/main/java/net/emustudio/application/gui/schema/elements/MemoryElement.java b/application/src/main/java/net/emustudio/application/gui/schema/elements/MemoryElement.java index cdec82f7a..8b2a6c689 100644 --- a/application/src/main/java/net/emustudio/application/gui/schema/elements/MemoryElement.java +++ b/application/src/main/java/net/emustudio/application/gui/schema/elements/MemoryElement.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.schema.elements; import com.electronwill.nightconfig.core.Config; -import net.emustudio.application.gui.P; +import net.emustudio.application.gui.framework.P; import net.emustudio.application.settings.PluginConfig; import net.emustudio.emulib.plugins.annotations.PLUGIN_TYPE; diff --git a/application/src/main/java/net/emustudio/application/gui/schema/mode/AbstractMode.java b/application/src/main/java/net/emustudio/application/gui/schema/mode/AbstractMode.java index c1044d6f0..1e32371d2 100644 --- a/application/src/main/java/net/emustudio/application/gui/schema/mode/AbstractMode.java +++ b/application/src/main/java/net/emustudio/application/gui/schema/mode/AbstractMode.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.schema.mode; diff --git a/application/src/main/java/net/emustudio/application/gui/schema/mode/Mode.java b/application/src/main/java/net/emustudio/application/gui/schema/mode/Mode.java index 101135545..6833b5b5c 100644 --- a/application/src/main/java/net/emustudio/application/gui/schema/mode/Mode.java +++ b/application/src/main/java/net/emustudio/application/gui/schema/mode/Mode.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.schema.mode; diff --git a/application/src/main/java/net/emustudio/application/gui/schema/mode/ModeSelector.java b/application/src/main/java/net/emustudio/application/gui/schema/mode/ModeSelector.java index c025b0be2..6c011efc3 100644 --- a/application/src/main/java/net/emustudio/application/gui/schema/mode/ModeSelector.java +++ b/application/src/main/java/net/emustudio/application/gui/schema/mode/ModeSelector.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.schema.mode; diff --git a/application/src/main/java/net/emustudio/application/gui/schema/mode/ModelingMode.java b/application/src/main/java/net/emustudio/application/gui/schema/mode/ModelingMode.java index 059e79029..a642c9788 100644 --- a/application/src/main/java/net/emustudio/application/gui/schema/mode/ModelingMode.java +++ b/application/src/main/java/net/emustudio/application/gui/schema/mode/ModelingMode.java @@ -1,8 +1,8 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.schema.mode; -import net.emustudio.application.gui.P; +import net.emustudio.application.gui.framework.P; import net.emustudio.application.gui.schema.DrawingModel; import net.emustudio.application.gui.schema.DrawingPanel; import net.emustudio.application.gui.schema.elements.ConnectionLine; diff --git a/application/src/main/java/net/emustudio/application/gui/schema/mode/MovingMode.java b/application/src/main/java/net/emustudio/application/gui/schema/mode/MovingMode.java index d27072068..3e8c7e1f1 100644 --- a/application/src/main/java/net/emustudio/application/gui/schema/mode/MovingMode.java +++ b/application/src/main/java/net/emustudio/application/gui/schema/mode/MovingMode.java @@ -1,8 +1,8 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.schema.mode; -import net.emustudio.application.gui.P; +import net.emustudio.application.gui.framework.P; import net.emustudio.application.gui.schema.DrawingModel; import net.emustudio.application.gui.schema.DrawingPanel; import net.emustudio.application.gui.schema.elements.ConnectionLine; diff --git a/application/src/main/java/net/emustudio/application/gui/schema/mode/ResizingMode.java b/application/src/main/java/net/emustudio/application/gui/schema/mode/ResizingMode.java index 28eb6175e..ceffada4d 100644 --- a/application/src/main/java/net/emustudio/application/gui/schema/mode/ResizingMode.java +++ b/application/src/main/java/net/emustudio/application/gui/schema/mode/ResizingMode.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.schema.mode; diff --git a/application/src/main/java/net/emustudio/application/gui/schema/mode/SelectingMode.java b/application/src/main/java/net/emustudio/application/gui/schema/mode/SelectingMode.java index 7f5ecb7be..6f1342348 100644 --- a/application/src/main/java/net/emustudio/application/gui/schema/mode/SelectingMode.java +++ b/application/src/main/java/net/emustudio/application/gui/schema/mode/SelectingMode.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.schema.mode; diff --git a/application/src/main/java/net/emustudio/application/internal/Hashing.java b/application/src/main/java/net/emustudio/application/internal/Hashing.java index 65faa82b6..e202bb57f 100644 --- a/application/src/main/java/net/emustudio/application/internal/Hashing.java +++ b/application/src/main/java/net/emustudio/application/internal/Hashing.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.internal; diff --git a/application/src/main/java/net/emustudio/application/internal/Reflection.java b/application/src/main/java/net/emustudio/application/internal/Reflection.java index 9c09828cc..2f17cd3db 100644 --- a/application/src/main/java/net/emustudio/application/internal/Reflection.java +++ b/application/src/main/java/net/emustudio/application/internal/Reflection.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.internal; diff --git a/application/src/main/java/net/emustudio/application/settings/AppSettings.java b/application/src/main/java/net/emustudio/application/settings/AppSettings.java index 6c31533a3..5ee995418 100644 --- a/application/src/main/java/net/emustudio/application/settings/AppSettings.java +++ b/application/src/main/java/net/emustudio/application/settings/AppSettings.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.settings; @@ -17,13 +17,19 @@ public class AppSettings extends BasicSettingsImpl { public final static String KEY_AUTO = EMUSTUDIO_AUTO.substring(EMUSTUDIO_PREFIX.length()); public final static String KEY_USE_SCHEMA_GRID = "useSchemaGrid"; public final static String KEY_SCHEMA_GRID_GAP = "schemaGridGap"; - public final static String KEY_LOOK_AND_FEEL = "lookAndFeel"; + public final static String KEY_THEME = "theme"; private final static int DEFAULT_GRID_GAP = 20; public transient final boolean emuStudioAuto; public transient final boolean noGUI; + public enum Theme { + LIGHT, + DARK, + INTELLIJ + } + public AppSettings(Config config, boolean nogui, boolean auto) { super(config, System.out::println); this.emuStudioAuto = auto; @@ -57,8 +63,8 @@ public void setSchemaGridGap(int value) { setInt(KEY_SCHEMA_GRID_GAP, value); } - public Optional getLookAndFeel() { - return getString(KEY_LOOK_AND_FEEL); + public Optional getTheme() { + return getString(KEY_THEME).map(Theme::valueOf); } @Override diff --git a/application/src/main/java/net/emustudio/application/settings/BasicSettingsImpl.java b/application/src/main/java/net/emustudio/application/settings/BasicSettingsImpl.java index b4d9e69aa..84f7ebe57 100644 --- a/application/src/main/java/net/emustudio/application/settings/BasicSettingsImpl.java +++ b/application/src/main/java/net/emustudio/application/settings/BasicSettingsImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.settings; diff --git a/application/src/main/java/net/emustudio/application/settings/ComputerConfig.java b/application/src/main/java/net/emustudio/application/settings/ComputerConfig.java index 43481b762..5717fc837 100644 --- a/application/src/main/java/net/emustudio/application/settings/ComputerConfig.java +++ b/application/src/main/java/net/emustudio/application/settings/ComputerConfig.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.settings; diff --git a/application/src/main/java/net/emustudio/application/settings/ConfigFiles.java b/application/src/main/java/net/emustudio/application/settings/ConfigFiles.java index e1321a49e..2b133cda7 100644 --- a/application/src/main/java/net/emustudio/application/settings/ConfigFiles.java +++ b/application/src/main/java/net/emustudio/application/settings/ConfigFiles.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.settings; diff --git a/application/src/main/java/net/emustudio/application/settings/PluginConfig.java b/application/src/main/java/net/emustudio/application/settings/PluginConfig.java index c919a0018..4bbd87b1e 100644 --- a/application/src/main/java/net/emustudio/application/settings/PluginConfig.java +++ b/application/src/main/java/net/emustudio/application/settings/PluginConfig.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.settings; import com.electronwill.nightconfig.core.Config; -import net.emustudio.application.gui.P; +import net.emustudio.application.gui.framework.P; import net.emustudio.emulib.plugins.annotations.PLUGIN_TYPE; import java.nio.file.Path; diff --git a/application/src/main/java/net/emustudio/application/settings/PluginConnection.java b/application/src/main/java/net/emustudio/application/settings/PluginConnection.java index 66824dece..3485e9659 100644 --- a/application/src/main/java/net/emustudio/application/settings/PluginConnection.java +++ b/application/src/main/java/net/emustudio/application/settings/PluginConnection.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.settings; diff --git a/application/src/main/java/net/emustudio/application/settings/PluginSettingsImpl.java b/application/src/main/java/net/emustudio/application/settings/PluginSettingsImpl.java index 853c72a32..5d20fb9ce 100644 --- a/application/src/main/java/net/emustudio/application/settings/PluginSettingsImpl.java +++ b/application/src/main/java/net/emustudio/application/settings/PluginSettingsImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.settings; diff --git a/application/src/main/java/net/emustudio/application/settings/SchemaPoint.java b/application/src/main/java/net/emustudio/application/settings/SchemaPoint.java index b65d63f2b..f4ee79cb3 100644 --- a/application/src/main/java/net/emustudio/application/settings/SchemaPoint.java +++ b/application/src/main/java/net/emustudio/application/settings/SchemaPoint.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.settings; diff --git a/application/src/main/java/net/emustudio/application/virtualcomputer/ContextPoolImpl.java b/application/src/main/java/net/emustudio/application/virtualcomputer/ContextPoolImpl.java index 57bcfea5a..27584297d 100644 --- a/application/src/main/java/net/emustudio/application/virtualcomputer/ContextPoolImpl.java +++ b/application/src/main/java/net/emustudio/application/virtualcomputer/ContextPoolImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.virtualcomputer; diff --git a/application/src/main/java/net/emustudio/application/virtualcomputer/InvalidPluginException.java b/application/src/main/java/net/emustudio/application/virtualcomputer/InvalidPluginException.java index 43db6dfc9..f9f6c1870 100644 --- a/application/src/main/java/net/emustudio/application/virtualcomputer/InvalidPluginException.java +++ b/application/src/main/java/net/emustudio/application/virtualcomputer/InvalidPluginException.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.virtualcomputer; diff --git a/application/src/main/java/net/emustudio/application/virtualcomputer/PluginConnections.java b/application/src/main/java/net/emustudio/application/virtualcomputer/PluginConnections.java index 4024234af..a203b4a24 100644 --- a/application/src/main/java/net/emustudio/application/virtualcomputer/PluginConnections.java +++ b/application/src/main/java/net/emustudio/application/virtualcomputer/PluginConnections.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.virtualcomputer; diff --git a/application/src/main/java/net/emustudio/application/virtualcomputer/PluginLoader.java b/application/src/main/java/net/emustudio/application/virtualcomputer/PluginLoader.java index a4e3aab8e..cb0c1ff53 100644 --- a/application/src/main/java/net/emustudio/application/virtualcomputer/PluginLoader.java +++ b/application/src/main/java/net/emustudio/application/virtualcomputer/PluginLoader.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.virtualcomputer; diff --git a/application/src/main/java/net/emustudio/application/virtualcomputer/PluginLoadingException.java b/application/src/main/java/net/emustudio/application/virtualcomputer/PluginLoadingException.java index 5cc3375ec..a7d950133 100644 --- a/application/src/main/java/net/emustudio/application/virtualcomputer/PluginLoadingException.java +++ b/application/src/main/java/net/emustudio/application/virtualcomputer/PluginLoadingException.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.virtualcomputer; diff --git a/application/src/main/java/net/emustudio/application/virtualcomputer/VirtualComputer.java b/application/src/main/java/net/emustudio/application/virtualcomputer/VirtualComputer.java index e63be64e1..ea863c40b 100644 --- a/application/src/main/java/net/emustudio/application/virtualcomputer/VirtualComputer.java +++ b/application/src/main/java/net/emustudio/application/virtualcomputer/VirtualComputer.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.virtualcomputer; @@ -135,7 +135,7 @@ private static Plugin createPluginInstance(long pluginID, Class constructor = mainClass.getDeclaredConstructor(PLUGIN_CONSTRUCTOR_PARAMS); return (Plugin) constructor.newInstance(pluginID, applicationApi, pluginSettings); diff --git a/application/src/test/java/net/emustudio/application/emulation/EmulationControllerTest.java b/application/src/test/java/net/emustudio/application/emulation/EmulationControllerTest.java index 1703118fd..7bbce4df9 100644 --- a/application/src/test/java/net/emustudio/application/emulation/EmulationControllerTest.java +++ b/application/src/test/java/net/emustudio/application/emulation/EmulationControllerTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.emulation; diff --git a/application/src/test/java/net/emustudio/application/gui/debugtable/CallFlowTest.java b/application/src/test/java/net/emustudio/application/gui/debugtable/CallFlowTest.java index 3a39518b0..872e65913 100644 --- a/application/src/test/java/net/emustudio/application/gui/debugtable/CallFlowTest.java +++ b/application/src/test/java/net/emustudio/application/gui/debugtable/CallFlowTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.debugtable; diff --git a/application/src/test/java/net/emustudio/application/gui/debugtable/DisassemblerStub.java b/application/src/test/java/net/emustudio/application/gui/debugtable/DisassemblerStub.java index a916292d5..31feb80ba 100644 --- a/application/src/test/java/net/emustudio/application/gui/debugtable/DisassemblerStub.java +++ b/application/src/test/java/net/emustudio/application/gui/debugtable/DisassemblerStub.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.debugtable; diff --git a/application/src/test/java/net/emustudio/application/gui/debugtable/MockHelper.java b/application/src/test/java/net/emustudio/application/gui/debugtable/MockHelper.java index f0f89339d..53015e885 100644 --- a/application/src/test/java/net/emustudio/application/gui/debugtable/MockHelper.java +++ b/application/src/test/java/net/emustudio/application/gui/debugtable/MockHelper.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.debugtable; diff --git a/application/src/test/java/net/emustudio/application/gui/debugtable/PaginatingDisassemblerTest.java b/application/src/test/java/net/emustudio/application/gui/debugtable/PaginatingDisassemblerTest.java index 7c5e415d7..ff376e770 100644 --- a/application/src/test/java/net/emustudio/application/gui/debugtable/PaginatingDisassemblerTest.java +++ b/application/src/test/java/net/emustudio/application/gui/debugtable/PaginatingDisassemblerTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.debugtable; diff --git a/application/src/test/java/net/emustudio/application/gui/dialogs/PluginComboModelTest.java b/application/src/test/java/net/emustudio/application/gui/dialogs/PluginComboModelTest.java index 8ff705802..05bb94fd7 100644 --- a/application/src/test/java/net/emustudio/application/gui/dialogs/PluginComboModelTest.java +++ b/application/src/test/java/net/emustudio/application/gui/dialogs/PluginComboModelTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.gui.dialogs; diff --git a/application/src/test/java/net/emustudio/application/settings/AppSettingsTest.java b/application/src/test/java/net/emustudio/application/settings/AppSettingsTest.java index 3ca3ac541..f21910ad5 100644 --- a/application/src/test/java/net/emustudio/application/settings/AppSettingsTest.java +++ b/application/src/test/java/net/emustudio/application/settings/AppSettingsTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.settings; diff --git a/application/src/test/java/net/emustudio/application/settings/ComputerConfigTest.java b/application/src/test/java/net/emustudio/application/settings/ComputerConfigTest.java index 6f9b3774d..65378ad41 100644 --- a/application/src/test/java/net/emustudio/application/settings/ComputerConfigTest.java +++ b/application/src/test/java/net/emustudio/application/settings/ComputerConfigTest.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.settings; import com.electronwill.nightconfig.core.Config; -import net.emustudio.application.gui.P; +import net.emustudio.application.gui.framework.P; import net.emustudio.emulib.plugins.annotations.PLUGIN_TYPE; import org.junit.After; import org.junit.Before; diff --git a/application/src/test/java/net/emustudio/application/settings/ConfigFilesTest.java b/application/src/test/java/net/emustudio/application/settings/ConfigFilesTest.java index 180244e8e..68ce4231d 100644 --- a/application/src/test/java/net/emustudio/application/settings/ConfigFilesTest.java +++ b/application/src/test/java/net/emustudio/application/settings/ConfigFilesTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.settings; diff --git a/application/src/test/java/net/emustudio/application/settings/PluginConfigTest.java b/application/src/test/java/net/emustudio/application/settings/PluginConfigTest.java index eaad67c1b..6c9146eca 100644 --- a/application/src/test/java/net/emustudio/application/settings/PluginConfigTest.java +++ b/application/src/test/java/net/emustudio/application/settings/PluginConfigTest.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.settings; import com.electronwill.nightconfig.core.Config; -import net.emustudio.application.gui.P; +import net.emustudio.application.gui.framework.P; import net.emustudio.emulib.plugins.annotations.PLUGIN_TYPE; import org.junit.Test; diff --git a/application/src/test/java/net/emustudio/application/settings/SchemaPointTest.java b/application/src/test/java/net/emustudio/application/settings/SchemaPointTest.java index c3719fd43..9b0dc057c 100644 --- a/application/src/test/java/net/emustudio/application/settings/SchemaPointTest.java +++ b/application/src/test/java/net/emustudio/application/settings/SchemaPointTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.settings; diff --git a/application/src/test/java/net/emustudio/application/virtualcomputer/ContextPoolImplTest.java b/application/src/test/java/net/emustudio/application/virtualcomputer/ContextPoolImplTest.java index 92b277861..beaa88807 100644 --- a/application/src/test/java/net/emustudio/application/virtualcomputer/ContextPoolImplTest.java +++ b/application/src/test/java/net/emustudio/application/virtualcomputer/ContextPoolImplTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.virtualcomputer; diff --git a/application/src/test/java/net/emustudio/application/virtualcomputer/ContextStubs.java b/application/src/test/java/net/emustudio/application/virtualcomputer/ContextStubs.java index ef92feb1d..7dd06a1d6 100644 --- a/application/src/test/java/net/emustudio/application/virtualcomputer/ContextStubs.java +++ b/application/src/test/java/net/emustudio/application/virtualcomputer/ContextStubs.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.virtualcomputer; diff --git a/application/src/test/java/net/emustudio/application/virtualcomputer/JarCreator.java b/application/src/test/java/net/emustudio/application/virtualcomputer/JarCreator.java index 7976f0a20..a1519c497 100644 --- a/application/src/test/java/net/emustudio/application/virtualcomputer/JarCreator.java +++ b/application/src/test/java/net/emustudio/application/virtualcomputer/JarCreator.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.virtualcomputer; diff --git a/application/src/test/java/net/emustudio/application/virtualcomputer/PluginLoaderTest.java b/application/src/test/java/net/emustudio/application/virtualcomputer/PluginLoaderTest.java index 4339b00d8..decf55579 100644 --- a/application/src/test/java/net/emustudio/application/virtualcomputer/PluginLoaderTest.java +++ b/application/src/test/java/net/emustudio/application/virtualcomputer/PluginLoaderTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.virtualcomputer; diff --git a/application/src/test/java/net/emustudio/application/virtualcomputer/VirtualComputerTest.java b/application/src/test/java/net/emustudio/application/virtualcomputer/VirtualComputerTest.java index b630a277a..bb7a7ca4f 100644 --- a/application/src/test/java/net/emustudio/application/virtualcomputer/VirtualComputerTest.java +++ b/application/src/test/java/net/emustudio/application/virtualcomputer/VirtualComputerTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.virtualcomputer; diff --git a/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/AbstractCPUStub.java b/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/AbstractCPUStub.java index b52a2c442..b5391535f 100644 --- a/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/AbstractCPUStub.java +++ b/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/AbstractCPUStub.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.virtualcomputer.stubs; diff --git a/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/CPUContextStub.java b/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/CPUContextStub.java index 163c01f29..4045d279b 100644 --- a/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/CPUContextStub.java +++ b/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/CPUContextStub.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.virtualcomputer.stubs; diff --git a/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/CPUImplStub.java b/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/CPUImplStub.java index d243efe84..5d56a719c 100644 --- a/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/CPUImplStub.java +++ b/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/CPUImplStub.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.virtualcomputer.stubs; diff --git a/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/CPUListenerStub.java b/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/CPUListenerStub.java index 4f6c7516b..5bedb93ea 100644 --- a/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/CPUListenerStub.java +++ b/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/CPUListenerStub.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.virtualcomputer.stubs; diff --git a/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/CompilerContextStub.java b/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/CompilerContextStub.java index d220bd870..17504e720 100644 --- a/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/CompilerContextStub.java +++ b/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/CompilerContextStub.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.virtualcomputer.stubs; diff --git a/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/DeviceContextStub.java b/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/DeviceContextStub.java index 5c2e1de75..2f52c4a40 100644 --- a/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/DeviceContextStub.java +++ b/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/DeviceContextStub.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.virtualcomputer.stubs; diff --git a/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/ShortMemoryContextStub.java b/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/ShortMemoryContextStub.java index a8b0a36e2..ca98d3edf 100644 --- a/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/ShortMemoryContextStub.java +++ b/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/ShortMemoryContextStub.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.virtualcomputer.stubs; diff --git a/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/UnannotatedCPUStub.java b/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/UnannotatedCPUStub.java index 41550066d..9319b11fd 100644 --- a/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/UnannotatedCPUStub.java +++ b/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/UnannotatedCPUStub.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.virtualcomputer.stubs; diff --git a/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/UnannotatedContextStub.java b/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/UnannotatedContextStub.java index 6c567c21b..921d6eb53 100644 --- a/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/UnannotatedContextStub.java +++ b/application/src/test/java/net/emustudio/application/virtualcomputer/stubs/UnannotatedContextStub.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.application.virtualcomputer.stubs; diff --git a/application/src/test/resources/dependencies/APluginDependsOnB.java b/application/src/test/resources/dependencies/APluginDependsOnB.java index 152a31994..5d665f67d 100644 --- a/application/src/test/resources/dependencies/APluginDependsOnB.java +++ b/application/src/test/resources/dependencies/APluginDependsOnB.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package dependencies; diff --git a/application/src/test/resources/dependencies/hidden/BdependsOnC.java b/application/src/test/resources/dependencies/hidden/BdependsOnC.java index d1881e7c8..c6da453ef 100644 --- a/application/src/test/resources/dependencies/hidden/BdependsOnC.java +++ b/application/src/test/resources/dependencies/hidden/BdependsOnC.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package dependencies.hidden; diff --git a/application/src/test/resources/dependencies/hidden/C.java b/application/src/test/resources/dependencies/hidden/C.java index 9fc5fe976..9102fab65 100644 --- a/application/src/test/resources/dependencies/hidden/C.java +++ b/application/src/test/resources/dependencies/hidden/C.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package dependencies.hidden; diff --git a/build.gradle b/build.gradle index c987db4a9..984af493e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,18 +1,21 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import java.text.SimpleDateFormat apply from: 'test_report.gradle' ext.versions = [ - slf4j: '2.0.17' + slf4j: '2.0.17', + flatlaf: '3.5.2' ] ext.libs = [ emuLib : "net.emustudio:emulib:12.1.0-SNAPSHOT", - cpuTestSuite : "net.emustudio:cpu-testsuite_12.1:1.2.0-SNAPSHOT", + cpuTestSuite : "net.emustudio:cpu-testsuite_12:1.2.1-SNAPSHOT", migLayout : "com.miglayout:miglayout-swing:11.1", + flatLaf : "com.formdev:flatlaf:${versions.flatlaf}:no-natives", + flatLafExtras : "com.formdev:flatlaf-extras:${versions.flatlaf}", jcipAnnotations : "net.jcip:jcip-annotations:1.0", antlr : "org.antlr:antlr4:4.13.2", diff --git a/plugins/compiler/as-8080/build.gradle b/plugins/compiler/as-8080/build.gradle index 9699c562b..dd108c474 100644 --- a/plugins/compiler/as-8080/build.gradle +++ b/plugins/compiler/as-8080/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens diff --git a/plugins/compiler/as-8080/src/main/antlr/As8080Lexer.g4 b/plugins/compiler/as-8080/src/main/antlr/As8080Lexer.g4 index 61272dd74..42d6e52ae 100644 --- a/plugins/compiler/as-8080/src/main/antlr/As8080Lexer.g4 +++ b/plugins/compiler/as-8080/src/main/antlr/As8080Lexer.g4 @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ lexer grammar As8080Lexer; diff --git a/plugins/compiler/as-8080/src/main/antlr/As8080Parser.g4 b/plugins/compiler/as-8080/src/main/antlr/As8080Parser.g4 index b3b4018ae..b4925a3e0 100644 --- a/plugins/compiler/as-8080/src/main/antlr/As8080Parser.g4 +++ b/plugins/compiler/as-8080/src/main/antlr/As8080Parser.g4 @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ parser grammar As8080Parser; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/Assembler8080.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/Assembler8080.java index d9362cc3e..e73b51133 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/Assembler8080.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/Assembler8080.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080; @@ -24,7 +24,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.FileReader; import java.io.IOException; import java.io.Reader; import java.nio.charset.StandardCharsets; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/CompileError.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/CompileError.java index 04429a8e2..11c94270e 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/CompileError.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/CompileError.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/LexicalAnalyzerImpl.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/LexicalAnalyzerImpl.java index 301e349ec..56a41d6e1 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/LexicalAnalyzerImpl.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/LexicalAnalyzerImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ParserErrorListener.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ParserErrorListener.java index c3a745961..ecda7c5cc 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ParserErrorListener.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ParserErrorListener.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ParsingUtils.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ParsingUtils.java index bd5bbd2ec..5e51a139a 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ParsingUtils.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ParsingUtils.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/Runner.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/Runner.java index 562d9b1c8..e4bc2ee7a 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/Runner.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/Runner.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/Evaluated.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/Evaluated.java index 6920b4f1e..23ce4243a 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/Evaluated.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/Evaluated.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/NameSpace.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/NameSpace.java index d78771048..27ba6c865 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/NameSpace.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/NameSpace.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/Node.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/Node.java index 28ef7e1fa..5821c2938 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/Node.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/Node.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/Program.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/Program.java index 6b0d82955..df9c9b0d8 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/Program.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/Program.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/data/DataDB.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/data/DataDB.java index aff139865..5b4790d8b 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/data/DataDB.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/data/DataDB.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.data; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/data/DataDS.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/data/DataDS.java index 7fd2d0238..500f5c9ea 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/data/DataDS.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/data/DataDS.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.data; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/data/DataDW.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/data/DataDW.java index c696ceb4c..b92657102 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/data/DataDW.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/data/DataDW.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.data; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/expr/ExprCurrentAddress.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/expr/ExprCurrentAddress.java index e41e291a9..99d2406f6 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/expr/ExprCurrentAddress.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/expr/ExprCurrentAddress.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.expr; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/expr/ExprId.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/expr/ExprId.java index 3a8b61506..f92d197c2 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/expr/ExprId.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/expr/ExprId.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.expr; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/expr/ExprInfix.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/expr/ExprInfix.java index 4ff6b0700..15b7ada2c 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/expr/ExprInfix.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/expr/ExprInfix.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.expr; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/expr/ExprNumber.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/expr/ExprNumber.java index cd92dd13b..862177133 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/expr/ExprNumber.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/expr/ExprNumber.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.expr; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/expr/ExprString.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/expr/ExprString.java index eea6d9f05..5f2e31e0f 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/expr/ExprString.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/expr/ExprString.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.expr; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/expr/ExprUnary.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/expr/ExprUnary.java index 3eff5ef88..cc4f8fd3e 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/expr/ExprUnary.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/expr/ExprUnary.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.expr; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrExpr.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrExpr.java index 94065b4c8..4ee044e72 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrExpr.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrExpr.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.instr; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrNoArgs.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrNoArgs.java index 57d62d0dd..f8fcab691 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrNoArgs.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrNoArgs.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.instr; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrReg.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrReg.java index 1b3f278df..20818ab7a 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrReg.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrReg.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.instr; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrRegExpr.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrRegExpr.java index 6385f9ada..d87864620 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrRegExpr.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrRegExpr.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.instr; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrRegPair.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrRegPair.java index e17a12762..6c0f2ab83 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrRegPair.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrRegPair.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.instr; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrRegPairExpr.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrRegPairExpr.java index 0f432d58f..6c0880175 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrRegPairExpr.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrRegPairExpr.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.instr; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrRegReg.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrRegReg.java index b4225bbe5..02bd1b0ae 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrRegReg.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/instr/InstrRegReg.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.instr; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoEqu.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoEqu.java index 58e2b310b..9c703e8db 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoEqu.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoEqu.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.pseudo; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoIf.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoIf.java index 5f61b4cfb..bf0e1e46f 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoIf.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoIf.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.pseudo; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoIfExpression.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoIfExpression.java index b919d346e..c614dd4b8 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoIfExpression.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoIfExpression.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.pseudo; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoInclude.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoInclude.java index 127e59e7a..405ea6907 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoInclude.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoInclude.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.pseudo; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoLabel.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoLabel.java index 5d0dbc8b5..ca436a69c 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoLabel.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoLabel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.pseudo; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoMacroArgument.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoMacroArgument.java index 18061d9ba..7bc67e84e 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoMacroArgument.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoMacroArgument.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.pseudo; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoMacroCall.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoMacroCall.java index 9c99f5ddc..70d555a33 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoMacroCall.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoMacroCall.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.pseudo; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoMacroDef.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoMacroDef.java index 6141d1093..b7cff69cc 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoMacroDef.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoMacroDef.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.pseudo; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoMacroParameter.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoMacroParameter.java index 74e81c3eb..ae1682fe7 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoMacroParameter.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoMacroParameter.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.pseudo; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoOrg.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoOrg.java index 67993072b..03fb972c0 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoOrg.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoOrg.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.pseudo; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoSet.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoSet.java index a4f88385c..44818d2aa 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoSet.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/ast/pseudo/PseudoSet.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.ast.pseudo; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/exceptions/CompileException.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/exceptions/CompileException.java index 55c852e85..bb63e4577 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/exceptions/CompileException.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/exceptions/CompileException.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.exceptions; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/exceptions/FatalError.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/exceptions/FatalError.java index 1f532a410..f87680a45 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/exceptions/FatalError.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/exceptions/FatalError.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.exceptions; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/exceptions/SyntaxErrorException.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/exceptions/SyntaxErrorException.java index 5d144a3d0..73b0b2e17 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/exceptions/SyntaxErrorException.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/exceptions/SyntaxErrorException.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.exceptions; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CheckDeclarationsVisitor.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CheckDeclarationsVisitor.java index bc80be07f..2f9dde230 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CheckDeclarationsVisitor.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CheckDeclarationsVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.visitors; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CheckExprSizesVisitor.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CheckExprSizesVisitor.java index 5a0f7b083..541ab3f35 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CheckExprSizesVisitor.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CheckExprSizesVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.visitors; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreateDataVisitor.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreateDataVisitor.java index 189beb92c..43df1d36d 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreateDataVisitor.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreateDataVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.visitors; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreateExprVisitor.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreateExprVisitor.java index 514c1ee99..62bdc5eee 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreateExprVisitor.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreateExprVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.visitors; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreateInstrVisitor.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreateInstrVisitor.java index eb3ce4d06..7d0760872 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreateInstrVisitor.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreateInstrVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.visitors; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreateLineVisitor.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreateLineVisitor.java index a1929e7cc..ccdada05a 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreateLineVisitor.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreateLineVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.visitors; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreateProgramVisitor.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreateProgramVisitor.java index 929267773..be24acd2f 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreateProgramVisitor.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreateProgramVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.visitors; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreatePseudoVisitor.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreatePseudoVisitor.java index 0adcbf70a..0aeb997a2 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreatePseudoVisitor.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreatePseudoVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.visitors; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreateVisitors.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreateVisitors.java index 157d9d1a2..c853c7f60 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreateVisitors.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/CreateVisitors.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.visitors; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/EvaluateExprVisitor.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/EvaluateExprVisitor.java index 22e67c7be..4865ec7cc 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/EvaluateExprVisitor.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/EvaluateExprVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.visitors; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/ExpandIncludesVisitor.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/ExpandIncludesVisitor.java index 27a5c9dc1..235e115ca 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/ExpandIncludesVisitor.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/ExpandIncludesVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.visitors; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/ExpandMacrosVisitor.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/ExpandMacrosVisitor.java index 237274841..2a9fbd00f 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/ExpandMacrosVisitor.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/ExpandMacrosVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.visitors; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/GenerateCodeVisitor.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/GenerateCodeVisitor.java index aa467437b..12f15b03f 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/GenerateCodeVisitor.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/GenerateCodeVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.visitors; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/NodeVisitor.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/NodeVisitor.java index f598786f1..6396dc338 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/NodeVisitor.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/NodeVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.visitors; diff --git a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/SortMacroArgumentsVisitor.java b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/SortMacroArgumentsVisitor.java index 9d03189ca..e0aa70a38 100644 --- a/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/SortMacroArgumentsVisitor.java +++ b/plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/SortMacroArgumentsVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.visitors; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/LexicalAnalyzerImplTest.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/LexicalAnalyzerImplTest.java index 67f1cb5e9..af385dd63 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/LexicalAnalyzerImplTest.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/LexicalAnalyzerImplTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/RunnerTest.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/RunnerTest.java index 1e604ed08..40c73a357 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/RunnerTest.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/RunnerTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/Utils.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/Utils.java index 02c963ecc..b33223600 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/Utils.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/Utils.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/AbstractCompilerTest.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/AbstractCompilerTest.java index 06ec16b28..07e208d3f 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/AbstractCompilerTest.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/AbstractCompilerTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.e2e; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/Assembler8080Test.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/Assembler8080Test.java index f273388ca..784e67dc1 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/Assembler8080Test.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/Assembler8080Test.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.e2e; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/ConstantsAndVariablesTest.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/ConstantsAndVariablesTest.java index 7a1dc08ce..ceed15e8f 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/ConstantsAndVariablesTest.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/ConstantsAndVariablesTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.e2e; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/DataTest.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/DataTest.java index c8be216a9..9b9490abd 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/DataTest.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/DataTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.e2e; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/IfNodeTest.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/IfNodeTest.java index 9c03bb363..54fe8f70c 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/IfNodeTest.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/IfNodeTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.e2e; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/IncludeTest.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/IncludeTest.java index 7fe76d6aa..080d1db21 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/IncludeTest.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/IncludeTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.e2e; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/InstrExprTest.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/InstrExprTest.java index 2ba9a5252..549e4b198 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/InstrExprTest.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/InstrExprTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.e2e; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/InstrRegTest.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/InstrRegTest.java index 757e622f4..4f6035af8 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/InstrRegTest.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/InstrRegTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.e2e; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/MacroTest.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/MacroTest.java index ac0f8ecc4..c43d9b71f 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/MacroTest.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/MacroTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.e2e; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/PseudoOrgTest.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/PseudoOrgTest.java index 58593e683..c9e9a534b 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/PseudoOrgTest.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/e2e/PseudoOrgTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.e2e; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/parser/LexicalAnalyzerImplTest.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/parser/LexicalAnalyzerImplTest.java index 43748ee73..f10235b4e 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/parser/LexicalAnalyzerImplTest.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/parser/LexicalAnalyzerImplTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.parser; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/parser/ParseDataTest.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/parser/ParseDataTest.java index 843414afc..00f98fa6a 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/parser/ParseDataTest.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/parser/ParseDataTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.parser; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/parser/ParseExprTest.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/parser/ParseExprTest.java index 00f13835d..e082c4ac7 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/parser/ParseExprTest.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/parser/ParseExprTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.parser; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/parser/ParseInstrTest.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/parser/ParseInstrTest.java index aec38ad15..0cf664169 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/parser/ParseInstrTest.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/parser/ParseInstrTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.parser; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/parser/ParsePseudoTest.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/parser/ParsePseudoTest.java index fd223674d..a072f5823 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/parser/ParsePseudoTest.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/parser/ParsePseudoTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.parser; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/parser/ParsingUtilsTest.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/parser/ParsingUtilsTest.java index 6b9982e7a..ff2167401 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/parser/ParsingUtilsTest.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/parser/ParsingUtilsTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.parser; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/CheckDeclarationsVisitorTest.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/CheckDeclarationsVisitorTest.java index 3b479ac22..1e2de7489 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/CheckDeclarationsVisitorTest.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/CheckDeclarationsVisitorTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.visitors; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/CheckExprSizesVisitorTest.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/CheckExprSizesVisitorTest.java index d8025b258..9f0cec29b 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/CheckExprSizesVisitorTest.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/CheckExprSizesVisitorTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.visitors; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/EvaluateExprVisitorTest.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/EvaluateExprVisitorTest.java index bca7898ad..09a7bcefd 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/EvaluateExprVisitorTest.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/EvaluateExprVisitorTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.visitors; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/ExpandIncludesVisitorTest.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/ExpandIncludesVisitorTest.java index 003c9bc1c..f41e2a22a 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/ExpandIncludesVisitorTest.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/ExpandIncludesVisitorTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.visitors; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/ExpandMacrosTest.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/ExpandMacrosTest.java index 8119d3a83..05e2f6a3d 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/ExpandMacrosTest.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/ExpandMacrosTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.visitors; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/GenerateCodeVisitorTest.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/GenerateCodeVisitorTest.java index 6cc8919f6..cdd3ddbae 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/GenerateCodeVisitorTest.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/GenerateCodeVisitorTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.visitors; diff --git a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/SortMacroArgumentsVisitorTest.java b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/SortMacroArgumentsVisitorTest.java index 83512cf81..f328e7003 100644 --- a/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/SortMacroArgumentsVisitorTest.java +++ b/plugins/compiler/as-8080/src/test/java/net/emustudio/plugins/compiler/as8080/visitors/SortMacroArgumentsVisitorTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.as8080.visitors; diff --git a/plugins/compiler/as-ssem/build.gradle b/plugins/compiler/as-ssem/build.gradle index af920586c..c1b411645 100644 --- a/plugins/compiler/as-ssem/build.gradle +++ b/plugins/compiler/as-ssem/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens diff --git a/plugins/compiler/as-ssem/src/main/antlr/SSEMLexer.g4 b/plugins/compiler/as-ssem/src/main/antlr/SSEMLexer.g4 index baed110aa..ecd0d5327 100644 --- a/plugins/compiler/as-ssem/src/main/antlr/SSEMLexer.g4 +++ b/plugins/compiler/as-ssem/src/main/antlr/SSEMLexer.g4 @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ lexer grammar SSEMLexer; diff --git a/plugins/compiler/as-ssem/src/main/antlr/SSEMParser.g4 b/plugins/compiler/as-ssem/src/main/antlr/SSEMParser.g4 index 31d455bf7..c058de908 100644 --- a/plugins/compiler/as-ssem/src/main/antlr/SSEMParser.g4 +++ b/plugins/compiler/as-ssem/src/main/antlr/SSEMParser.g4 @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ parser grammar SSEMParser; diff --git a/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/CodeGenerator.java b/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/CodeGenerator.java index 1eaf47977..9afbd7658 100644 --- a/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/CodeGenerator.java +++ b/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/CodeGenerator.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ssem; diff --git a/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/CompileException.java b/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/CompileException.java index ec1b6d5f6..a2bc093a3 100644 --- a/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/CompileException.java +++ b/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/CompileException.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ssem; diff --git a/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/CompilerChecks.java b/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/CompilerChecks.java index 4c4e0918e..c0d4e3bef 100644 --- a/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/CompilerChecks.java +++ b/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/CompilerChecks.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ssem; diff --git a/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/LexicalAnalyzerImpl.java b/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/LexicalAnalyzerImpl.java index 1d82f5baf..662bd6b47 100644 --- a/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/LexicalAnalyzerImpl.java +++ b/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/LexicalAnalyzerImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ssem; diff --git a/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/ParserErrorListener.java b/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/ParserErrorListener.java index aae1d4bc5..78e4a59b3 100644 --- a/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/ParserErrorListener.java +++ b/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/ParserErrorListener.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ssem; diff --git a/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/Position.java b/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/Position.java index d4beb84d0..f5f1dbfff 100644 --- a/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/Position.java +++ b/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/Position.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ssem; diff --git a/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/Runner.java b/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/Runner.java index 1a124c1fd..7ae875d40 100644 --- a/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/Runner.java +++ b/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/Runner.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ssem; diff --git a/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/SSEMCompiler.java b/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/SSEMCompiler.java index 673f384c0..75cd7fc01 100644 --- a/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/SSEMCompiler.java +++ b/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/SSEMCompiler.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ssem; diff --git a/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/ast/Instruction.java b/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/ast/Instruction.java index 78f9448e7..6c61f1f78 100644 --- a/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/ast/Instruction.java +++ b/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/ast/Instruction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ssem.ast; diff --git a/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/ast/Program.java b/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/ast/Program.java index 6184fd3c2..9978a076b 100644 --- a/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/ast/Program.java +++ b/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/ast/Program.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ssem.ast; diff --git a/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/ast/ProgramParser.java b/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/ast/ProgramParser.java index cc2d7435c..d56c2e97d 100644 --- a/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/ast/ProgramParser.java +++ b/plugins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/ast/ProgramParser.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ssem.ast; diff --git a/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/LexerTest.java b/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/LexerTest.java index c266d70ae..7e30a008d 100644 --- a/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/LexerTest.java +++ b/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/LexerTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ssem; diff --git a/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/LexicalAnalyzerImplTest.java b/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/LexicalAnalyzerImplTest.java index a307fbe77..cdb485c3a 100644 --- a/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/LexicalAnalyzerImplTest.java +++ b/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/LexicalAnalyzerImplTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ssem; diff --git a/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/ParserTest.java b/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/ParserTest.java index ee0a6b60d..ff2bd4b52 100644 --- a/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/ParserTest.java +++ b/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/ParserTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ssem; diff --git a/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/RunnerTest.java b/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/RunnerTest.java index 01d4854b5..62c5eab04 100644 --- a/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/RunnerTest.java +++ b/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/RunnerTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ssem; diff --git a/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/SSEMCompilerTest.java b/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/SSEMCompilerTest.java index 5fa779cf8..9e007783c 100644 --- a/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/SSEMCompilerTest.java +++ b/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/SSEMCompilerTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ssem; diff --git a/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/Utils.java b/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/Utils.java index 8a7bd3bd4..92e747f78 100644 --- a/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/Utils.java +++ b/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/Utils.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ssem; diff --git a/plugins/compiler/as-z80/build.gradle b/plugins/compiler/as-z80/build.gradle index 267bd3c11..3c3cad0df 100644 --- a/plugins/compiler/as-z80/build.gradle +++ b/plugins/compiler/as-z80/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens diff --git a/plugins/compiler/as-z80/src/main/antlr/AsZ80Lexer.g4 b/plugins/compiler/as-z80/src/main/antlr/AsZ80Lexer.g4 index 6613fe308..b0feb773e 100644 --- a/plugins/compiler/as-z80/src/main/antlr/AsZ80Lexer.g4 +++ b/plugins/compiler/as-z80/src/main/antlr/AsZ80Lexer.g4 @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ lexer grammar AsZ80Lexer; diff --git a/plugins/compiler/as-z80/src/main/antlr/AsZ80Parser.g4 b/plugins/compiler/as-z80/src/main/antlr/AsZ80Parser.g4 index 615d6dacf..5dd6f4558 100644 --- a/plugins/compiler/as-z80/src/main/antlr/AsZ80Parser.g4 +++ b/plugins/compiler/as-z80/src/main/antlr/AsZ80Parser.g4 @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ parser grammar AsZ80Parser; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/AssemblerZ80.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/AssemblerZ80.java index f311cb4d5..fa8355441 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/AssemblerZ80.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/AssemblerZ80.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/CompileError.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/CompileError.java index 973bb32e9..c57c42aae 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/CompileError.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/CompileError.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/CompilerTables.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/CompilerTables.java index 8555bc561..2086d89ac 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/CompilerTables.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/CompilerTables.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/LexicalAnalyzerImpl.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/LexicalAnalyzerImpl.java index e220fb28a..d3a83069a 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/LexicalAnalyzerImpl.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/LexicalAnalyzerImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/Pair.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/Pair.java index 9f735ce53..f70bc55d5 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/Pair.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/Pair.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ParserErrorListener.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ParserErrorListener.java index b022c2287..06400ab41 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ParserErrorListener.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ParserErrorListener.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ParsingUtils.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ParsingUtils.java index bd31aecd2..e220b771f 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ParsingUtils.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ParsingUtils.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/Runner.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/Runner.java index 94864ac06..81e80a830 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/Runner.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/Runner.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/Evaluated.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/Evaluated.java index 8781e42c3..bb8fa935d 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/Evaluated.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/Evaluated.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/NameSpace.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/NameSpace.java index 2f9f9edaf..cd5b0d51c 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/NameSpace.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/NameSpace.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/Node.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/Node.java index 058d6bb67..7e9ecfdf3 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/Node.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/Node.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/Program.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/Program.java index 7a610ab2d..d0dfeba97 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/Program.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/Program.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/data/DataDB.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/data/DataDB.java index 929f902f5..aa05f51ba 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/data/DataDB.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/data/DataDB.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.data; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/data/DataDS.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/data/DataDS.java index b4d940e04..ba9ccd3e6 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/data/DataDS.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/data/DataDS.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.data; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/data/DataDW.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/data/DataDW.java index fad5799d6..4a53b9bd6 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/data/DataDW.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/data/DataDW.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.data; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/expr/ExprCurrentAddress.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/expr/ExprCurrentAddress.java index 40533bbf0..5ea5acd4a 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/expr/ExprCurrentAddress.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/expr/ExprCurrentAddress.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.expr; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/expr/ExprId.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/expr/ExprId.java index 4a7b8e85f..eae426a07 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/expr/ExprId.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/expr/ExprId.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.expr; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/expr/ExprInfix.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/expr/ExprInfix.java index 4374cdb2a..d5020594a 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/expr/ExprInfix.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/expr/ExprInfix.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.expr; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/expr/ExprNumber.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/expr/ExprNumber.java index bfdf4d070..cbe8282ef 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/expr/ExprNumber.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/expr/ExprNumber.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.expr; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/expr/ExprString.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/expr/ExprString.java index ddf866839..0679b55ee 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/expr/ExprString.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/expr/ExprString.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.expr; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/expr/ExprUnary.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/expr/ExprUnary.java index 167b23386..518704946 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/expr/ExprUnary.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/expr/ExprUnary.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.expr; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/instr/Instr.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/instr/Instr.java index 6a6862259..fb1ceb745 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/instr/Instr.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/instr/Instr.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.instr; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/instr/InstrCB.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/instr/InstrCB.java index 0310b798a..c7260c5d1 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/instr/InstrCB.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/instr/InstrCB.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.instr; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/instr/InstrED.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/instr/InstrED.java index 8987d9c5d..1f089947d 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/instr/InstrED.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/instr/InstrED.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.instr; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/instr/InstrXD.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/instr/InstrXD.java index e1c1e05f4..9d45a0755 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/instr/InstrXD.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/instr/InstrXD.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.instr; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/instr/InstrXDCB.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/instr/InstrXDCB.java index 480e0b303..b434af452 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/instr/InstrXDCB.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/instr/InstrXDCB.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.instr; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoEqu.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoEqu.java index 5fd8f49e1..0b5e59bae 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoEqu.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoEqu.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.pseudo; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoIf.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoIf.java index 252f91f1f..c15b1f30f 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoIf.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoIf.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.pseudo; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoIfExpression.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoIfExpression.java index 8a4088684..376505ab5 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoIfExpression.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoIfExpression.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.pseudo; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoInclude.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoInclude.java index 3e9ffa701..9e6bb64b6 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoInclude.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoInclude.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.pseudo; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoLabel.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoLabel.java index c4686c30b..a2d0fadb4 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoLabel.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoLabel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.pseudo; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoMacroArgument.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoMacroArgument.java index 5b3a1b93e..a84bde5ac 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoMacroArgument.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoMacroArgument.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.pseudo; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoMacroCall.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoMacroCall.java index de165f6a9..109adb7e0 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoMacroCall.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoMacroCall.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.pseudo; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoMacroDef.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoMacroDef.java index 5bdc2745f..c92ab9fca 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoMacroDef.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoMacroDef.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.pseudo; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoMacroParameter.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoMacroParameter.java index 12df8f08f..38bd470e0 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoMacroParameter.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoMacroParameter.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.pseudo; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoOrg.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoOrg.java index d87b34f0c..6505f9698 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoOrg.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoOrg.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.pseudo; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoVar.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoVar.java index cf7b042ec..742013569 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoVar.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/pseudo/PseudoVar.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.ast.pseudo; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/exceptions/CompileException.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/exceptions/CompileException.java index 69049ba7f..1a4982e3a 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/exceptions/CompileException.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/exceptions/CompileException.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.exceptions; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/exceptions/FatalError.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/exceptions/FatalError.java index 849ecae37..76df4d6d7 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/exceptions/FatalError.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/exceptions/FatalError.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.exceptions; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/exceptions/SyntaxErrorException.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/exceptions/SyntaxErrorException.java index 1e8815cd8..1b0983e44 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/exceptions/SyntaxErrorException.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/exceptions/SyntaxErrorException.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.exceptions; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CheckDeclarationsVisitor.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CheckDeclarationsVisitor.java index 2e2e699c3..da1472cf0 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CheckDeclarationsVisitor.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CheckDeclarationsVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.visitors; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CheckExprSizesVisitor.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CheckExprSizesVisitor.java index d059939b0..2a54f9aa9 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CheckExprSizesVisitor.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CheckExprSizesVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.visitors; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CollectExprsInOpcodeVisitor.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CollectExprsInOpcodeVisitor.java index 3685a3644..007558a1c 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CollectExprsInOpcodeVisitor.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CollectExprsInOpcodeVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.visitors; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreateDataVisitor.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreateDataVisitor.java index 1d2f5c574..5d511c4f3 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreateDataVisitor.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreateDataVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.visitors; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreateExprVisitor.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreateExprVisitor.java index 854d06152..159e87dfe 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreateExprVisitor.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreateExprVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.visitors; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreateInstrVisitor.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreateInstrVisitor.java index 54008d187..687715563 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreateInstrVisitor.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreateInstrVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.visitors; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreateLineVisitor.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreateLineVisitor.java index 5a89d9961..77ccfe24c 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreateLineVisitor.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreateLineVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.visitors; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreateProgramVisitor.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreateProgramVisitor.java index c7d910899..51421f254 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreateProgramVisitor.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreateProgramVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.visitors; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreatePseudoVisitor.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreatePseudoVisitor.java index 4ba489742..98efc8874 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreatePseudoVisitor.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreatePseudoVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.visitors; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreateVisitors.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreateVisitors.java index 039098493..9662da8fd 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreateVisitors.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/CreateVisitors.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.visitors; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/EvaluateExprVisitor.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/EvaluateExprVisitor.java index 237666230..a76e52a66 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/EvaluateExprVisitor.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/EvaluateExprVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.visitors; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/ExpandIncludesVisitor.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/ExpandIncludesVisitor.java index bd05d23ab..74d22092e 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/ExpandIncludesVisitor.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/ExpandIncludesVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.visitors; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/ExpandMacrosVisitor.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/ExpandMacrosVisitor.java index 4d57ee382..09407e646 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/ExpandMacrosVisitor.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/ExpandMacrosVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.visitors; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/GenerateCodeVisitor.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/GenerateCodeVisitor.java index 7aeb003dc..5a23211e3 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/GenerateCodeVisitor.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/GenerateCodeVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.visitors; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/NodeVisitor.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/NodeVisitor.java index 4abb66958..93fb7822f 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/NodeVisitor.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/NodeVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.visitors; diff --git a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/SortMacroArgumentsVisitor.java b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/SortMacroArgumentsVisitor.java index a23ffea41..a8ec9dad7 100644 --- a/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/SortMacroArgumentsVisitor.java +++ b/plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/SortMacroArgumentsVisitor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.visitors; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/LexicalAnalyzerImplTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/LexicalAnalyzerImplTest.java index 41cbfa7bf..0baeda8f3 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/LexicalAnalyzerImplTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/LexicalAnalyzerImplTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/RunnerTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/RunnerTest.java index daa95fe74..44c82aa59 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/RunnerTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/RunnerTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/Utils.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/Utils.java index 9b23effbb..927724103 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/Utils.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/Utils.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/AbstractCompilerTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/AbstractCompilerTest.java index cba567397..8fb1e5272 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/AbstractCompilerTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/AbstractCompilerTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.e2e; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/AssemblerZ80Test.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/AssemblerZ80Test.java index cedfff3f8..2bcfb997b 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/AssemblerZ80Test.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/AssemblerZ80Test.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.e2e; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/ConstantsAndVariablesTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/ConstantsAndVariablesTest.java index afd406c58..f2e312fc0 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/ConstantsAndVariablesTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/ConstantsAndVariablesTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.e2e; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/DataTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/DataTest.java index afb3ef631..5e4ce6394 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/DataTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/DataTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.e2e; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/IfNodeTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/IfNodeTest.java index cd7278f05..164f36b87 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/IfNodeTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/IfNodeTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.e2e; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/IncludeTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/IncludeTest.java index 425ec7afd..ffee83dbd 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/IncludeTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/IncludeTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.e2e; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/InstrExprTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/InstrExprTest.java index 498893315..e0812e02b 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/InstrExprTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/InstrExprTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.e2e; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/InstrRegTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/InstrRegTest.java index 73a794667..7b5923567 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/InstrRegTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/InstrRegTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.e2e; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/JumpTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/JumpTest.java index 70fa6e5c7..9d05c16dc 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/JumpTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/JumpTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.e2e; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/MacroTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/MacroTest.java index 175cc8500..45ac5bf03 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/MacroTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/MacroTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.e2e; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/PseudoOrgTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/PseudoOrgTest.java index 5bf658f93..097b3680e 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/PseudoOrgTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/e2e/PseudoOrgTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.e2e; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/parser/LexicalAnalyzerImplTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/parser/LexicalAnalyzerImplTest.java index 625eb22da..2ad97c75b 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/parser/LexicalAnalyzerImplTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/parser/LexicalAnalyzerImplTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.parser; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/parser/ParseDataTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/parser/ParseDataTest.java index 3007d2180..759b6d478 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/parser/ParseDataTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/parser/ParseDataTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.parser; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/parser/ParseExprTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/parser/ParseExprTest.java index ff3a3712b..74f72b882 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/parser/ParseExprTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/parser/ParseExprTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.parser; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/parser/ParseInstrTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/parser/ParseInstrTest.java index 8236c10e9..5df0ff49e 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/parser/ParseInstrTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/parser/ParseInstrTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.parser; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/parser/ParsePseudoTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/parser/ParsePseudoTest.java index 8dc59eef0..e7c3795b5 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/parser/ParsePseudoTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/parser/ParsePseudoTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.parser; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/parser/ParsingUtilsTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/parser/ParsingUtilsTest.java index a7216e183..c9bc21c03 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/parser/ParsingUtilsTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/parser/ParsingUtilsTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.parser; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/CheckDeclarationsVisitorTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/CheckDeclarationsVisitorTest.java index 2ea8535e1..2c6ff7b40 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/CheckDeclarationsVisitorTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/CheckDeclarationsVisitorTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.visitors; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/CheckExprSizesVisitorTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/CheckExprSizesVisitorTest.java index c3ceff9a5..81629455f 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/CheckExprSizesVisitorTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/CheckExprSizesVisitorTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.visitors; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/EvaluateExprVisitorTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/EvaluateExprVisitorTest.java index fef46f936..cb7fb519a 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/EvaluateExprVisitorTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/EvaluateExprVisitorTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.visitors; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/ExpandIncludesVisitorTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/ExpandIncludesVisitorTest.java index da73ca110..c3358ac60 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/ExpandIncludesVisitorTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/ExpandIncludesVisitorTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.visitors; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/ExpandMacrosTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/ExpandMacrosTest.java index 5cea6094a..2e6996464 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/ExpandMacrosTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/ExpandMacrosTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.visitors; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/GenerateCodeVisitorTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/GenerateCodeVisitorTest.java index 2f9bde351..de7228068 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/GenerateCodeVisitorTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/GenerateCodeVisitorTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.visitors; diff --git a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/SortMacroArgumentsVisitorTest.java b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/SortMacroArgumentsVisitorTest.java index 152e504be..22eb985c2 100644 --- a/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/SortMacroArgumentsVisitorTest.java +++ b/plugins/compiler/as-z80/src/test/java/net/emustudio/plugins/compiler/asZ80/visitors/SortMacroArgumentsVisitorTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.asZ80.visitors; diff --git a/plugins/compiler/brainc-brainduck/build.gradle b/plugins/compiler/brainc-brainduck/build.gradle index 666ac58d4..93350667b 100644 --- a/plugins/compiler/brainc-brainduck/build.gradle +++ b/plugins/compiler/brainc-brainduck/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens diff --git a/plugins/compiler/brainc-brainduck/src/main/antlr/BraincLexer.g4 b/plugins/compiler/brainc-brainduck/src/main/antlr/BraincLexer.g4 index 97761e900..cab54d096 100644 --- a/plugins/compiler/brainc-brainduck/src/main/antlr/BraincLexer.g4 +++ b/plugins/compiler/brainc-brainduck/src/main/antlr/BraincLexer.g4 @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ lexer grammar BraincLexer; diff --git a/plugins/compiler/brainc-brainduck/src/main/antlr/BraincParser.g4 b/plugins/compiler/brainc-brainduck/src/main/antlr/BraincParser.g4 index 01af29b94..46b3d5c98 100644 --- a/plugins/compiler/brainc-brainduck/src/main/antlr/BraincParser.g4 +++ b/plugins/compiler/brainc-brainduck/src/main/antlr/BraincParser.g4 @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ parser grammar BraincParser; diff --git a/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/CompileException.java b/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/CompileException.java index 8a14daf52..513fa0f5d 100644 --- a/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/CompileException.java +++ b/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/CompileException.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.brainduck; diff --git a/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/CompilerBrainduck.java b/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/CompilerBrainduck.java index f5ea5cd9d..9adcec6b1 100644 --- a/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/CompilerBrainduck.java +++ b/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/CompilerBrainduck.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.brainduck; diff --git a/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/LexicalAnalyzerImpl.java b/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/LexicalAnalyzerImpl.java index 8b75ae8df..e4188ab63 100644 --- a/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/LexicalAnalyzerImpl.java +++ b/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/LexicalAnalyzerImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.brainduck; diff --git a/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/ParserErrorListener.java b/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/ParserErrorListener.java index 9207340c6..980a92b25 100644 --- a/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/ParserErrorListener.java +++ b/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/ParserErrorListener.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.brainduck; diff --git a/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/Runner.java b/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/Runner.java index c933a8332..666540718 100644 --- a/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/Runner.java +++ b/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/Runner.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.brainduck; diff --git a/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/ast/Instruction.java b/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/ast/Instruction.java index dcba908da..d0d4b6c5e 100644 --- a/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/ast/Instruction.java +++ b/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/ast/Instruction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.brainduck.ast; diff --git a/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/ast/Program.java b/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/ast/Program.java index 6afd1da19..edd25741e 100644 --- a/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/ast/Program.java +++ b/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/ast/Program.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.brainduck.ast; diff --git a/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/ast/ProgramParser.java b/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/ast/ProgramParser.java index a66b12f59..d79aacc7f 100644 --- a/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/ast/ProgramParser.java +++ b/plugins/compiler/brainc-brainduck/src/main/java/net/emustudio/plugins/compiler/brainduck/ast/ProgramParser.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.brainduck.ast; diff --git a/plugins/compiler/brainc-brainduck/src/test/java/net/emustudio/plugins/compiler/brainduck/AbstractCompilerTest.java b/plugins/compiler/brainc-brainduck/src/test/java/net/emustudio/plugins/compiler/brainduck/AbstractCompilerTest.java index 04e95950e..a51f12126 100644 --- a/plugins/compiler/brainc-brainduck/src/test/java/net/emustudio/plugins/compiler/brainduck/AbstractCompilerTest.java +++ b/plugins/compiler/brainc-brainduck/src/test/java/net/emustudio/plugins/compiler/brainduck/AbstractCompilerTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.brainduck; diff --git a/plugins/compiler/brainc-brainduck/src/test/java/net/emustudio/plugins/compiler/brainduck/InstructionTest.java b/plugins/compiler/brainc-brainduck/src/test/java/net/emustudio/plugins/compiler/brainduck/InstructionTest.java index ee89bb7a7..8714ff8b5 100644 --- a/plugins/compiler/brainc-brainduck/src/test/java/net/emustudio/plugins/compiler/brainduck/InstructionTest.java +++ b/plugins/compiler/brainc-brainduck/src/test/java/net/emustudio/plugins/compiler/brainduck/InstructionTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.brainduck; diff --git a/plugins/compiler/brainc-brainduck/src/test/java/net/emustudio/plugins/compiler/brainduck/LexicalAnalyzerImplTest.java b/plugins/compiler/brainc-brainduck/src/test/java/net/emustudio/plugins/compiler/brainduck/LexicalAnalyzerImplTest.java index 75010a31b..e369ef8c0 100644 --- a/plugins/compiler/brainc-brainduck/src/test/java/net/emustudio/plugins/compiler/brainduck/LexicalAnalyzerImplTest.java +++ b/plugins/compiler/brainc-brainduck/src/test/java/net/emustudio/plugins/compiler/brainduck/LexicalAnalyzerImplTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.brainduck; diff --git a/plugins/compiler/brainc-brainduck/src/test/java/net/emustudio/plugins/compiler/brainduck/RunnerTest.java b/plugins/compiler/brainc-brainduck/src/test/java/net/emustudio/plugins/compiler/brainduck/RunnerTest.java index 0b06e1fb1..a4a849462 100644 --- a/plugins/compiler/brainc-brainduck/src/test/java/net/emustudio/plugins/compiler/brainduck/RunnerTest.java +++ b/plugins/compiler/brainc-brainduck/src/test/java/net/emustudio/plugins/compiler/brainduck/RunnerTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.brainduck; diff --git a/plugins/compiler/ramc-ram/build.gradle b/plugins/compiler/ramc-ram/build.gradle index d5bcd5ba9..452ec6fd3 100644 --- a/plugins/compiler/ramc-ram/build.gradle +++ b/plugins/compiler/ramc-ram/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens diff --git a/plugins/compiler/ramc-ram/src/main/antlr/RAMLexer.g4 b/plugins/compiler/ramc-ram/src/main/antlr/RAMLexer.g4 index 6ec7c33a1..5b549864c 100644 --- a/plugins/compiler/ramc-ram/src/main/antlr/RAMLexer.g4 +++ b/plugins/compiler/ramc-ram/src/main/antlr/RAMLexer.g4 @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ lexer grammar RAMLexer; diff --git a/plugins/compiler/ramc-ram/src/main/antlr/RAMParser.g4 b/plugins/compiler/ramc-ram/src/main/antlr/RAMParser.g4 index dd1c333bf..6ce3187d6 100644 --- a/plugins/compiler/ramc-ram/src/main/antlr/RAMParser.g4 +++ b/plugins/compiler/ramc-ram/src/main/antlr/RAMParser.g4 @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ parser grammar RAMParser; diff --git a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/CompilerRAM.java b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/CompilerRAM.java index 76a4af186..cbe422f80 100644 --- a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/CompilerRAM.java +++ b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/CompilerRAM.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ram; diff --git a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/LexicalAnalyzerImpl.java b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/LexicalAnalyzerImpl.java index 949af89c8..3a7bbceb2 100644 --- a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/LexicalAnalyzerImpl.java +++ b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/LexicalAnalyzerImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ram; diff --git a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ParserErrorListener.java b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ParserErrorListener.java index 7a03e4431..b14f790e3 100644 --- a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ParserErrorListener.java +++ b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ParserErrorListener.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ram; diff --git a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ParsingUtils.java b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ParsingUtils.java index 397d61f2f..a5b69aa7f 100644 --- a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ParsingUtils.java +++ b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ParsingUtils.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ram; diff --git a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ProgramParser.java b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ProgramParser.java index 96c65bc3b..3b1286a07 100644 --- a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ProgramParser.java +++ b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ProgramParser.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ram; diff --git a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/Runner.java b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/Runner.java index b79f5ddcf..87639d20f 100644 --- a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/Runner.java +++ b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/Runner.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ram; diff --git a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/SerializableOptional.java b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/SerializableOptional.java index 9ffa20b02..46ce5be99 100644 --- a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/SerializableOptional.java +++ b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/SerializableOptional.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ram; diff --git a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ast/Instruction.java b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ast/Instruction.java index 2fa3de0ae..fc9ce6f54 100644 --- a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ast/Instruction.java +++ b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ast/Instruction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ram.ast; diff --git a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ast/Label.java b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ast/Label.java index 1f3dd90bf..726da06f2 100644 --- a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ast/Label.java +++ b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ast/Label.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ram.ast; diff --git a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ast/Program.java b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ast/Program.java index 893d3ed13..0011aa8fe 100644 --- a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ast/Program.java +++ b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ast/Program.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ram.ast; diff --git a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ast/Value.java b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ast/Value.java index 033fcea19..b74a32584 100644 --- a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ast/Value.java +++ b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/ast/Value.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ram.ast; diff --git a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/exceptions/CompileException.java b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/exceptions/CompileException.java index 9b792df0e..f8cf9bff3 100644 --- a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/exceptions/CompileException.java +++ b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/exceptions/CompileException.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ram.exceptions; diff --git a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/exceptions/SyntaxErrorException.java b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/exceptions/SyntaxErrorException.java index ca2179f6b..48843094c 100644 --- a/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/exceptions/SyntaxErrorException.java +++ b/plugins/compiler/ramc-ram/src/main/java/net/emustudio/plugins/compiler/ram/exceptions/SyntaxErrorException.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ram.exceptions; diff --git a/plugins/compiler/ramc-ram/src/test/java/net/emustudio/plugins/compiler/ram/AbstractCompilerTest.java b/plugins/compiler/ramc-ram/src/test/java/net/emustudio/plugins/compiler/ram/AbstractCompilerTest.java index 24a2ddf0d..02122fe5d 100644 --- a/plugins/compiler/ramc-ram/src/test/java/net/emustudio/plugins/compiler/ram/AbstractCompilerTest.java +++ b/plugins/compiler/ramc-ram/src/test/java/net/emustudio/plugins/compiler/ram/AbstractCompilerTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ram; diff --git a/plugins/compiler/ramc-ram/src/test/java/net/emustudio/plugins/compiler/ram/CompilerTest.java b/plugins/compiler/ramc-ram/src/test/java/net/emustudio/plugins/compiler/ram/CompilerTest.java index 9d23b86af..37c706c1c 100644 --- a/plugins/compiler/ramc-ram/src/test/java/net/emustudio/plugins/compiler/ram/CompilerTest.java +++ b/plugins/compiler/ramc-ram/src/test/java/net/emustudio/plugins/compiler/ram/CompilerTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ram; diff --git a/plugins/compiler/ramc-ram/src/test/java/net/emustudio/plugins/compiler/ram/LexicalAnalyzerImplTest.java b/plugins/compiler/ramc-ram/src/test/java/net/emustudio/plugins/compiler/ram/LexicalAnalyzerImplTest.java index 42e9f9e19..e63a27000 100644 --- a/plugins/compiler/ramc-ram/src/test/java/net/emustudio/plugins/compiler/ram/LexicalAnalyzerImplTest.java +++ b/plugins/compiler/ramc-ram/src/test/java/net/emustudio/plugins/compiler/ram/LexicalAnalyzerImplTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ram; diff --git a/plugins/compiler/ramc-ram/src/test/java/net/emustudio/plugins/compiler/ram/MemoryStub.java b/plugins/compiler/ramc-ram/src/test/java/net/emustudio/plugins/compiler/ram/MemoryStub.java index 8f2c2a323..77dfe6eed 100644 --- a/plugins/compiler/ramc-ram/src/test/java/net/emustudio/plugins/compiler/ram/MemoryStub.java +++ b/plugins/compiler/ramc-ram/src/test/java/net/emustudio/plugins/compiler/ram/MemoryStub.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ram; diff --git a/plugins/compiler/ramc-ram/src/test/java/net/emustudio/plugins/compiler/ram/RunnerTest.java b/plugins/compiler/ramc-ram/src/test/java/net/emustudio/plugins/compiler/ram/RunnerTest.java index 50fcbcfac..ee07614e4 100644 --- a/plugins/compiler/ramc-ram/src/test/java/net/emustudio/plugins/compiler/ram/RunnerTest.java +++ b/plugins/compiler/ramc-ram/src/test/java/net/emustudio/plugins/compiler/ram/RunnerTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.ram; diff --git a/plugins/compiler/raspc-rasp/build.gradle b/plugins/compiler/raspc-rasp/build.gradle index 9909e5723..ca70f43c4 100644 --- a/plugins/compiler/raspc-rasp/build.gradle +++ b/plugins/compiler/raspc-rasp/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens diff --git a/plugins/compiler/raspc-rasp/src/main/antlr/RASPLexer.g4 b/plugins/compiler/raspc-rasp/src/main/antlr/RASPLexer.g4 index 4d17be960..2703e4524 100644 --- a/plugins/compiler/raspc-rasp/src/main/antlr/RASPLexer.g4 +++ b/plugins/compiler/raspc-rasp/src/main/antlr/RASPLexer.g4 @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ lexer grammar RASPLexer; diff --git a/plugins/compiler/raspc-rasp/src/main/antlr/RASPParser.g4 b/plugins/compiler/raspc-rasp/src/main/antlr/RASPParser.g4 index d148f2692..12723a566 100644 --- a/plugins/compiler/raspc-rasp/src/main/antlr/RASPParser.g4 +++ b/plugins/compiler/raspc-rasp/src/main/antlr/RASPParser.g4 @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ parser grammar RASPParser; diff --git a/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/CompilerRASP.java b/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/CompilerRASP.java index dfc487886..b6a615213 100644 --- a/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/CompilerRASP.java +++ b/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/CompilerRASP.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.rasp; diff --git a/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/LexicalAnalyzerImpl.java b/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/LexicalAnalyzerImpl.java index 3b8178beb..dccda8364 100644 --- a/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/LexicalAnalyzerImpl.java +++ b/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/LexicalAnalyzerImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.rasp; diff --git a/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/ParserErrorListener.java b/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/ParserErrorListener.java index 8dd5729a6..7dd54745d 100644 --- a/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/ParserErrorListener.java +++ b/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/ParserErrorListener.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.rasp; diff --git a/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/ParsingUtils.java b/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/ParsingUtils.java index 23083fe44..4c5cf880e 100644 --- a/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/ParsingUtils.java +++ b/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/ParsingUtils.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.rasp; diff --git a/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/ProgramParser.java b/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/ProgramParser.java index dbe75d907..c8a58d9ee 100644 --- a/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/ProgramParser.java +++ b/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/ProgramParser.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.rasp; diff --git a/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/Runner.java b/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/Runner.java index 9445edbca..acab5616f 100644 --- a/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/Runner.java +++ b/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/Runner.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.rasp; diff --git a/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/ast/Instruction.java b/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/ast/Instruction.java index 4069b2fa6..25cf1472a 100644 --- a/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/ast/Instruction.java +++ b/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/ast/Instruction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.rasp.ast; diff --git a/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/ast/Label.java b/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/ast/Label.java index 08eff246f..66dd7a7d4 100644 --- a/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/ast/Label.java +++ b/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/ast/Label.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.rasp.ast; diff --git a/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/ast/Program.java b/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/ast/Program.java index 6cdd0b1e6..52d8ed3a3 100644 --- a/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/ast/Program.java +++ b/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/ast/Program.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.rasp.ast; diff --git a/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/exceptions/CompileException.java b/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/exceptions/CompileException.java index bc9409537..66f2d3af0 100644 --- a/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/exceptions/CompileException.java +++ b/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/exceptions/CompileException.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.rasp.exceptions; diff --git a/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/exceptions/SyntaxErrorException.java b/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/exceptions/SyntaxErrorException.java index a80cc4ac5..9d776794e 100644 --- a/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/exceptions/SyntaxErrorException.java +++ b/plugins/compiler/raspc-rasp/src/main/java/net/emustudio/plugins/compiler/rasp/exceptions/SyntaxErrorException.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.rasp.exceptions; diff --git a/plugins/compiler/raspc-rasp/src/test/java/net/emustudio/plugins/compiler/rasp/AbstractCompilerTest.java b/plugins/compiler/raspc-rasp/src/test/java/net/emustudio/plugins/compiler/rasp/AbstractCompilerTest.java index d91c0fe53..0cfea7701 100644 --- a/plugins/compiler/raspc-rasp/src/test/java/net/emustudio/plugins/compiler/rasp/AbstractCompilerTest.java +++ b/plugins/compiler/raspc-rasp/src/test/java/net/emustudio/plugins/compiler/rasp/AbstractCompilerTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.rasp; diff --git a/plugins/compiler/raspc-rasp/src/test/java/net/emustudio/plugins/compiler/rasp/CompilerTest.java b/plugins/compiler/raspc-rasp/src/test/java/net/emustudio/plugins/compiler/rasp/CompilerTest.java index 7e1b61092..05d94e301 100644 --- a/plugins/compiler/raspc-rasp/src/test/java/net/emustudio/plugins/compiler/rasp/CompilerTest.java +++ b/plugins/compiler/raspc-rasp/src/test/java/net/emustudio/plugins/compiler/rasp/CompilerTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.rasp; diff --git a/plugins/compiler/raspc-rasp/src/test/java/net/emustudio/plugins/compiler/rasp/LexicalAnalyzerImplTest.java b/plugins/compiler/raspc-rasp/src/test/java/net/emustudio/plugins/compiler/rasp/LexicalAnalyzerImplTest.java index 9aa7e7be8..1c013c310 100644 --- a/plugins/compiler/raspc-rasp/src/test/java/net/emustudio/plugins/compiler/rasp/LexicalAnalyzerImplTest.java +++ b/plugins/compiler/raspc-rasp/src/test/java/net/emustudio/plugins/compiler/rasp/LexicalAnalyzerImplTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.rasp; diff --git a/plugins/compiler/raspc-rasp/src/test/java/net/emustudio/plugins/compiler/rasp/MemoryStub.java b/plugins/compiler/raspc-rasp/src/test/java/net/emustudio/plugins/compiler/rasp/MemoryStub.java index 4716b93d2..25b93b77a 100644 --- a/plugins/compiler/raspc-rasp/src/test/java/net/emustudio/plugins/compiler/rasp/MemoryStub.java +++ b/plugins/compiler/raspc-rasp/src/test/java/net/emustudio/plugins/compiler/rasp/MemoryStub.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.compiler.rasp; diff --git a/plugins/cpu/8080-cpu/build.gradle b/plugins/cpu/8080-cpu/build.gradle index 101ef0b2f..1e33dd596 100644 --- a/plugins/cpu/8080-cpu/build.gradle +++ b/plugins/cpu/8080-cpu/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens @@ -11,7 +11,7 @@ buildscript { plugins { id 'java' - id 'net.emustudio.edigen-plugin' version '1.5.2' + id 'net.emustudio.edigen-plugin' version '1.5.3-SNAPSHOT' id 'com.adarshr.test-logger' version '4.0.0' } diff --git a/plugins/cpu/8080-cpu/src/main/edigen/cpu.eds b/plugins/cpu/8080-cpu/src/main/edigen/cpu.eds index 2039dfe42..a11611827 100644 --- a/plugins/cpu/8080-cpu/src/main/edigen/cpu.eds +++ b/plugins/cpu/8080-cpu/src/main/edigen/cpu.eds @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ root instruction; diff --git a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/Context8080Impl.java b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/Context8080Impl.java index 722683cd4..3b297311c 100644 --- a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/Context8080Impl.java +++ b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/Context8080Impl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080; diff --git a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/CpuImpl.java b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/CpuImpl.java index 1fed0248a..fa617fa6a 100644 --- a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/CpuImpl.java +++ b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/CpuImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080; diff --git a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/DispatchTables.java b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/DispatchTables.java index e225940e9..656faea95 100644 --- a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/DispatchTables.java +++ b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/DispatchTables.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080; diff --git a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/EmulatorEngine.java b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/EmulatorEngine.java index f1f734cdd..d3390900a 100644 --- a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/EmulatorEngine.java +++ b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/EmulatorEngine.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080; diff --git a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/EmulatorTables.java b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/EmulatorTables.java index 29cb19625..83e20fc6a 100644 --- a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/EmulatorTables.java +++ b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/EmulatorTables.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080; diff --git a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/InitializerFor8080.java b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/InitializerFor8080.java index 1105dfd64..babdd59da 100644 --- a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/InitializerFor8080.java +++ b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/InitializerFor8080.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080; diff --git a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/InstructionPrinter.java b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/InstructionPrinter.java index 80d88a725..f2678ee68 100644 --- a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/InstructionPrinter.java +++ b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/InstructionPrinter.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080; diff --git a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/api/Context8080.java b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/api/Context8080.java index 0a4f2f4f0..015069df0 100644 --- a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/api/Context8080.java +++ b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/api/Context8080.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080.api; diff --git a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/api/CpuEngine.java b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/api/CpuEngine.java index d9d3ed6cf..87ea5a7fb 100644 --- a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/api/CpuEngine.java +++ b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/api/CpuEngine.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080.api; diff --git a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/api/DefaultInitializer.java b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/api/DefaultInitializer.java index 6a7c47562..9e01a480d 100644 --- a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/api/DefaultInitializer.java +++ b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/api/DefaultInitializer.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080.api; diff --git a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/api/DispatchListener.java b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/api/DispatchListener.java index 2bb5de9de..b8f8965be 100644 --- a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/api/DispatchListener.java +++ b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/api/DispatchListener.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080.api; diff --git a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/gui/FlagsModel.java b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/gui/FlagsModel.java index fc20d5885..f81febf48 100644 --- a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/gui/FlagsModel.java +++ b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/gui/FlagsModel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080.gui; diff --git a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/gui/StatusPanel.java b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/gui/StatusPanel.java index cca0ef092..8d2cdfe03 100644 --- a/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/gui/StatusPanel.java +++ b/plugins/cpu/8080-cpu/src/main/java/net/emustudio/plugins/cpu/intel8080/gui/StatusPanel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080.gui; @@ -16,7 +16,7 @@ import static net.emustudio.emulib.runtime.helpers.RadixUtils.formatByteHexString; import static net.emustudio.emulib.runtime.helpers.RadixUtils.formatWordHexString; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.FONT_TITLE_BORDER; +import static net.emustudio.emulib.runtime.ui.Constants.FONT_TITLE_BORDER; public class StatusPanel extends JPanel { private final CpuImpl cpu; diff --git a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/ArithmeticTest.java b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/ArithmeticTest.java index 4b87f61cd..c8def35b2 100644 --- a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/ArithmeticTest.java +++ b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/ArithmeticTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080; diff --git a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/ControlTest.java b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/ControlTest.java index ffd171d06..4469c9119 100644 --- a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/ControlTest.java +++ b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/ControlTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080; diff --git a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/CpuImplTest.java b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/CpuImplTest.java index c3091028c..a1d58e472 100644 --- a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/CpuImplTest.java +++ b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/CpuImplTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080; diff --git a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/InstructionsTest.java b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/InstructionsTest.java index 197d5a55d..8da338689 100644 --- a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/InstructionsTest.java +++ b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/InstructionsTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080; diff --git a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/LogicTest.java b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/LogicTest.java index a73c97c61..f0447d30d 100644 --- a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/LogicTest.java +++ b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/LogicTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080; diff --git a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/StackTest.java b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/StackTest.java index 1481d1d5a..ff8a67fdb 100644 --- a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/StackTest.java +++ b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/StackTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080; diff --git a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/TransferTest.java b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/TransferTest.java index 3ab9036dc..1cdd0aa80 100644 --- a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/TransferTest.java +++ b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/TransferTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080; diff --git a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/ByteTestBuilder.java b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/ByteTestBuilder.java index f0365837e..5552304f2 100644 --- a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/ByteTestBuilder.java +++ b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/ByteTestBuilder.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080.suite; diff --git a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/CpuRunnerImpl.java b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/CpuRunnerImpl.java index 75f86412d..88e9e5b08 100644 --- a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/CpuRunnerImpl.java +++ b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/CpuRunnerImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080.suite; diff --git a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/CpuVerifierImpl.java b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/CpuVerifierImpl.java index d9ed95e13..36f97e9bb 100644 --- a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/CpuVerifierImpl.java +++ b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/CpuVerifierImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080.suite; diff --git a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/FlagsCheckImpl.java b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/FlagsCheckImpl.java index fcbc5f1a7..a972db34c 100644 --- a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/FlagsCheckImpl.java +++ b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/FlagsCheckImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080.suite; diff --git a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/IntegerTestBuilder.java b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/IntegerTestBuilder.java index 06dd17241..81efd3459 100644 --- a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/IntegerTestBuilder.java +++ b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/IntegerTestBuilder.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080.suite; diff --git a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/injectors/Register.java b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/injectors/Register.java index 4fa3ace0f..0635642fd 100644 --- a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/injectors/Register.java +++ b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/injectors/Register.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080.suite.injectors; diff --git a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/injectors/RegisterPair.java b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/injectors/RegisterPair.java index 4ec539ffb..b5c9d0e5a 100644 --- a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/injectors/RegisterPair.java +++ b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/injectors/RegisterPair.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080.suite.injectors; diff --git a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/injectors/RegisterPairPSW.java b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/injectors/RegisterPairPSW.java index 0a9b508ef..e9d648775 100644 --- a/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/injectors/RegisterPairPSW.java +++ b/plugins/cpu/8080-cpu/src/test/java/net/emustudio/plugins/cpu/intel8080/suite/injectors/RegisterPairPSW.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.intel8080.suite.injectors; diff --git a/plugins/cpu/brainduck-cpu/build.gradle b/plugins/cpu/brainduck-cpu/build.gradle index 57cbfcd6b..dfe79d48c 100644 --- a/plugins/cpu/brainduck-cpu/build.gradle +++ b/plugins/cpu/brainduck-cpu/build.gradle @@ -1,10 +1,10 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens plugins { id 'java' - id 'net.emustudio.edigen-plugin' version '1.5.2' + id 'net.emustudio.edigen-plugin' version '1.5.3-SNAPSHOT' id 'com.adarshr.test-logger' version '4.0.0' } diff --git a/plugins/cpu/brainduck-cpu/src/main/edigen/cpu.eds b/plugins/cpu/brainduck-cpu/src/main/edigen/cpu.eds index 7b26c36f9..bd3ac4536 100644 --- a/plugins/cpu/brainduck-cpu/src/main/edigen/cpu.eds +++ b/plugins/cpu/brainduck-cpu/src/main/edigen/cpu.eds @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ root instruction; diff --git a/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/BrainCPUContext.java b/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/BrainCPUContext.java index bb1708a53..c7f750f0c 100644 --- a/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/BrainCPUContext.java +++ b/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/BrainCPUContext.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.brainduck; diff --git a/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/BrainCPUContextImpl.java b/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/BrainCPUContextImpl.java index cd9263306..083ea8d3d 100644 --- a/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/BrainCPUContextImpl.java +++ b/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/BrainCPUContextImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.brainduck; diff --git a/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/Breakpoint.java b/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/Breakpoint.java index fc42116e1..97328224a 100644 --- a/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/Breakpoint.java +++ b/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/Breakpoint.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.brainduck; diff --git a/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/CpuImpl.java b/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/CpuImpl.java index 904d5a8f0..7036ef891 100644 --- a/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/CpuImpl.java +++ b/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/CpuImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.brainduck; diff --git a/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/EmulatorEngine.java b/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/EmulatorEngine.java index 620de7623..18da1994f 100644 --- a/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/EmulatorEngine.java +++ b/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/EmulatorEngine.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.brainduck; diff --git a/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/Profiler.java b/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/Profiler.java index 9a53d14e2..e192ea20d 100644 --- a/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/Profiler.java +++ b/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/Profiler.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.brainduck; diff --git a/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/gui/ColumnsRepainter.java b/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/gui/ColumnsRepainter.java index 65c86b218..e54d64d8a 100644 --- a/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/gui/ColumnsRepainter.java +++ b/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/gui/ColumnsRepainter.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.brainduck.gui; @@ -11,7 +11,7 @@ import java.awt.*; import java.util.Enumeration; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.FONT_MONOSPACED; +import static net.emustudio.emulib.runtime.ui.Constants.FONT_MONOSPACED; public class ColumnsRepainter { diff --git a/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/gui/MemoryTableModel.java b/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/gui/MemoryTableModel.java index c27d805b4..92844deb0 100644 --- a/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/gui/MemoryTableModel.java +++ b/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/gui/MemoryTableModel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.brainduck.gui; diff --git a/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/gui/StatusPanel.java b/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/gui/StatusPanel.java index d70ba5f05..c884618fa 100644 --- a/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/gui/StatusPanel.java +++ b/plugins/cpu/brainduck-cpu/src/main/java/net/emustudio/plugins/cpu/brainduck/gui/StatusPanel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.brainduck.gui; @@ -10,7 +10,7 @@ import javax.swing.*; import javax.swing.table.DefaultTableModel; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.*; +import static net.emustudio.emulib.runtime.ui.Constants.*; public class StatusPanel extends JPanel { private final ColumnsRepainter columnsRepainter = new ColumnsRepainter(); diff --git a/plugins/cpu/brainduck-cpu/src/test/java/net/emustudio/plugins/cpu/brainduck/CpuImplTest.java b/plugins/cpu/brainduck-cpu/src/test/java/net/emustudio/plugins/cpu/brainduck/CpuImplTest.java index 4830537d1..b57f6d029 100644 --- a/plugins/cpu/brainduck-cpu/src/test/java/net/emustudio/plugins/cpu/brainduck/CpuImplTest.java +++ b/plugins/cpu/brainduck-cpu/src/test/java/net/emustudio/plugins/cpu/brainduck/CpuImplTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.brainduck; diff --git a/plugins/cpu/brainduck-cpu/src/test/java/net/emustudio/plugins/cpu/brainduck/DeviceStub.java b/plugins/cpu/brainduck-cpu/src/test/java/net/emustudio/plugins/cpu/brainduck/DeviceStub.java index 09f6d8874..031e7a3b6 100644 --- a/plugins/cpu/brainduck-cpu/src/test/java/net/emustudio/plugins/cpu/brainduck/DeviceStub.java +++ b/plugins/cpu/brainduck-cpu/src/test/java/net/emustudio/plugins/cpu/brainduck/DeviceStub.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.brainduck; diff --git a/plugins/cpu/brainduck-cpu/src/test/java/net/emustudio/plugins/cpu/brainduck/EmulatorEngineTest.java b/plugins/cpu/brainduck-cpu/src/test/java/net/emustudio/plugins/cpu/brainduck/EmulatorEngineTest.java index 91dca1c59..a435a6148 100644 --- a/plugins/cpu/brainduck-cpu/src/test/java/net/emustudio/plugins/cpu/brainduck/EmulatorEngineTest.java +++ b/plugins/cpu/brainduck-cpu/src/test/java/net/emustudio/plugins/cpu/brainduck/EmulatorEngineTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.brainduck; diff --git a/plugins/cpu/brainduck-cpu/src/test/java/net/emustudio/plugins/cpu/brainduck/MemoryStub.java b/plugins/cpu/brainduck-cpu/src/test/java/net/emustudio/plugins/cpu/brainduck/MemoryStub.java index e60c8b6fe..d6345153f 100644 --- a/plugins/cpu/brainduck-cpu/src/test/java/net/emustudio/plugins/cpu/brainduck/MemoryStub.java +++ b/plugins/cpu/brainduck-cpu/src/test/java/net/emustudio/plugins/cpu/brainduck/MemoryStub.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.brainduck; diff --git a/plugins/cpu/ram-cpu/build.gradle b/plugins/cpu/ram-cpu/build.gradle index 068adeaa5..4dd55a1ab 100644 --- a/plugins/cpu/ram-cpu/build.gradle +++ b/plugins/cpu/ram-cpu/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens diff --git a/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/Breakpoint.java b/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/Breakpoint.java index 1b4a1a7d6..2e4bb8068 100644 --- a/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/Breakpoint.java +++ b/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/Breakpoint.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.ram; diff --git a/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/CpuImpl.java b/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/CpuImpl.java index 487c2e4b9..00187c37b 100644 --- a/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/CpuImpl.java +++ b/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/CpuImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.ram; @@ -11,10 +11,10 @@ import net.emustudio.emulib.runtime.ApplicationApi; import net.emustudio.emulib.runtime.ContextAlreadyRegisteredException; import net.emustudio.emulib.runtime.InvalidContextException; -import net.emustudio.emulib.runtime.interaction.debugger.BreakpointColumn; -import net.emustudio.emulib.runtime.interaction.debugger.DebuggerTable; -import net.emustudio.emulib.runtime.interaction.debugger.MnemoColumn; import net.emustudio.emulib.runtime.settings.PluginSettings; +import net.emustudio.emulib.runtime.ui.debugger.BreakpointColumn; +import net.emustudio.emulib.runtime.ui.debugger.DebuggerTable; +import net.emustudio.emulib.runtime.ui.debugger.MnemoColumn; import net.emustudio.plugins.cpu.ram.gui.LabelDebugColumn; import net.emustudio.plugins.cpu.ram.gui.RamDisassembler; import net.emustudio.plugins.cpu.ram.gui.RamStatusPanel; diff --git a/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/EmulatorEngine.java b/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/EmulatorEngine.java index 0e03e2d7a..bd6ade533 100644 --- a/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/EmulatorEngine.java +++ b/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/EmulatorEngine.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.ram; diff --git a/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/RamCpuContextImpl.java b/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/RamCpuContextImpl.java index 327dac9b9..40d786eb7 100644 --- a/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/RamCpuContextImpl.java +++ b/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/RamCpuContextImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.ram; diff --git a/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/api/RamCpuContext.java b/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/api/RamCpuContext.java index 8464c3380..b3a34f139 100644 --- a/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/api/RamCpuContext.java +++ b/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/api/RamCpuContext.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.ram.api; diff --git a/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/gui/LabelDebugColumn.java b/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/gui/LabelDebugColumn.java index f91c9d5f5..d541a1910 100644 --- a/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/gui/LabelDebugColumn.java +++ b/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/gui/LabelDebugColumn.java @@ -1,8 +1,8 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.ram.gui; -import net.emustudio.emulib.runtime.interaction.debugger.DebuggerColumn; +import net.emustudio.emulib.runtime.ui.debugger.DebuggerColumn; import net.emustudio.plugins.memory.ram.api.RamLabel; import net.emustudio.plugins.memory.ram.api.RamMemoryContext; diff --git a/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/gui/RamDisassembler.java b/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/gui/RamDisassembler.java index e258a5091..04c5a640e 100644 --- a/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/gui/RamDisassembler.java +++ b/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/gui/RamDisassembler.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.ram.gui; diff --git a/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/gui/RamStatusPanel.java b/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/gui/RamStatusPanel.java index 85a159faf..880fbdb67 100644 --- a/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/gui/RamStatusPanel.java +++ b/plugins/cpu/ram-cpu/src/main/java/net/emustudio/plugins/cpu/ram/gui/RamStatusPanel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.ram.gui; @@ -9,7 +9,7 @@ import javax.swing.*; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.*; +import static net.emustudio.emulib.runtime.ui.Constants.*; public class RamStatusPanel extends JPanel { private final JLabel lblStatus = new JLabel("breakpoint"); @@ -31,7 +31,7 @@ public void runStateChanged(CPU.RunState state) { @Override public void internalStateChanged() { String r0 = cpu.getR0().toString(); - if (r0.equals("")) { + if (r0.isEmpty()) { r0 = ""; } txtR0.setText(r0); diff --git a/plugins/cpu/ram-cpu/src/test/java/net/emustudio/plugins/cpu/ram/AbstractEngineTest.java b/plugins/cpu/ram-cpu/src/test/java/net/emustudio/plugins/cpu/ram/AbstractEngineTest.java index 9115c511f..9776050b1 100644 --- a/plugins/cpu/ram-cpu/src/test/java/net/emustudio/plugins/cpu/ram/AbstractEngineTest.java +++ b/plugins/cpu/ram-cpu/src/test/java/net/emustudio/plugins/cpu/ram/AbstractEngineTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.ram; diff --git a/plugins/cpu/ram-cpu/src/test/java/net/emustudio/plugins/cpu/ram/CpuImplTest.java b/plugins/cpu/ram-cpu/src/test/java/net/emustudio/plugins/cpu/ram/CpuImplTest.java index be6eae6c0..3dc754c01 100644 --- a/plugins/cpu/ram-cpu/src/test/java/net/emustudio/plugins/cpu/ram/CpuImplTest.java +++ b/plugins/cpu/ram-cpu/src/test/java/net/emustudio/plugins/cpu/ram/CpuImplTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.ram; diff --git a/plugins/cpu/ram-cpu/src/test/java/net/emustudio/plugins/cpu/ram/EmulatorEngineTest.java b/plugins/cpu/ram-cpu/src/test/java/net/emustudio/plugins/cpu/ram/EmulatorEngineTest.java index b54e64167..bf53fe6e1 100644 --- a/plugins/cpu/ram-cpu/src/test/java/net/emustudio/plugins/cpu/ram/EmulatorEngineTest.java +++ b/plugins/cpu/ram-cpu/src/test/java/net/emustudio/plugins/cpu/ram/EmulatorEngineTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.ram; diff --git a/plugins/cpu/rasp-cpu/build.gradle b/plugins/cpu/rasp-cpu/build.gradle index 55534f7b6..a7d10b88a 100644 --- a/plugins/cpu/rasp-cpu/build.gradle +++ b/plugins/cpu/rasp-cpu/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens diff --git a/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/Breakpoint.java b/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/Breakpoint.java index 460dbc4c1..793e7fc44 100644 --- a/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/Breakpoint.java +++ b/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/Breakpoint.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.rasp; diff --git a/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/CpuImpl.java b/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/CpuImpl.java index bc0c3e25f..eec919250 100644 --- a/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/CpuImpl.java +++ b/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/CpuImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.rasp; @@ -12,8 +12,8 @@ import net.emustudio.emulib.runtime.ContextAlreadyRegisteredException; import net.emustudio.emulib.runtime.ContextPool; import net.emustudio.emulib.runtime.InvalidContextException; -import net.emustudio.emulib.runtime.interaction.debugger.*; import net.emustudio.emulib.runtime.settings.PluginSettings; +import net.emustudio.emulib.runtime.ui.debugger.*; import net.emustudio.plugins.cpu.rasp.gui.LabelDebugColumn; import net.emustudio.plugins.cpu.rasp.gui.RaspDisassembler; import net.emustudio.plugins.cpu.rasp.gui.RaspStatusPanel; diff --git a/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/EmulatorEngine.java b/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/EmulatorEngine.java index 548d2c2b2..304d3a796 100644 --- a/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/EmulatorEngine.java +++ b/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/EmulatorEngine.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.rasp; diff --git a/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/RaspCpuContextImpl.java b/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/RaspCpuContextImpl.java index 74b233f52..dccaf612a 100644 --- a/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/RaspCpuContextImpl.java +++ b/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/RaspCpuContextImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.rasp; diff --git a/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/api/RaspCpuContext.java b/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/api/RaspCpuContext.java index a2348f63f..28d1df140 100644 --- a/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/api/RaspCpuContext.java +++ b/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/api/RaspCpuContext.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.rasp.api; diff --git a/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/gui/LabelDebugColumn.java b/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/gui/LabelDebugColumn.java index df6aff8cc..187db4c15 100644 --- a/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/gui/LabelDebugColumn.java +++ b/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/gui/LabelDebugColumn.java @@ -1,8 +1,8 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.rasp.gui; -import net.emustudio.emulib.runtime.interaction.debugger.DebuggerColumn; +import net.emustudio.emulib.runtime.ui.debugger.DebuggerColumn; import net.emustudio.plugins.memory.rasp.api.RaspLabel; import net.emustudio.plugins.memory.rasp.api.RaspMemoryContext; diff --git a/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/gui/RaspDisassembler.java b/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/gui/RaspDisassembler.java index c3ebfc6f0..5a9a6822b 100644 --- a/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/gui/RaspDisassembler.java +++ b/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/gui/RaspDisassembler.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.rasp.gui; diff --git a/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/gui/RaspStatusPanel.java b/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/gui/RaspStatusPanel.java index 79e8adda6..d7c2d267d 100644 --- a/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/gui/RaspStatusPanel.java +++ b/plugins/cpu/rasp-cpu/src/main/java/net/emustudio/plugins/cpu/rasp/gui/RaspStatusPanel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.rasp.gui; @@ -9,7 +9,7 @@ import javax.swing.*; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.*; +import static net.emustudio.emulib.runtime.ui.Constants.*; public class RaspStatusPanel extends JPanel { private final JLabel lblStatus = new JLabel("breakpoint"); diff --git a/plugins/cpu/rasp-cpu/src/test/java/net/emustudio/plugins/cpu/rasp/CpuImplTest.java b/plugins/cpu/rasp-cpu/src/test/java/net/emustudio/plugins/cpu/rasp/CpuImplTest.java index b5d1ad4b7..09bf98d7d 100644 --- a/plugins/cpu/rasp-cpu/src/test/java/net/emustudio/plugins/cpu/rasp/CpuImplTest.java +++ b/plugins/cpu/rasp-cpu/src/test/java/net/emustudio/plugins/cpu/rasp/CpuImplTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.rasp; diff --git a/plugins/cpu/rasp-cpu/src/test/java/net/emustudio/plugins/cpu/rasp/EmulatorEngineTest.java b/plugins/cpu/rasp-cpu/src/test/java/net/emustudio/plugins/cpu/rasp/EmulatorEngineTest.java index 487d2ab17..2f3a5ed49 100644 --- a/plugins/cpu/rasp-cpu/src/test/java/net/emustudio/plugins/cpu/rasp/EmulatorEngineTest.java +++ b/plugins/cpu/rasp-cpu/src/test/java/net/emustudio/plugins/cpu/rasp/EmulatorEngineTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.rasp; diff --git a/plugins/cpu/rasp-cpu/src/test/java/net/emustudio/plugins/cpu/rasp/MemoryStub.java b/plugins/cpu/rasp-cpu/src/test/java/net/emustudio/plugins/cpu/rasp/MemoryStub.java index c9b214248..a90e18679 100644 --- a/plugins/cpu/rasp-cpu/src/test/java/net/emustudio/plugins/cpu/rasp/MemoryStub.java +++ b/plugins/cpu/rasp-cpu/src/test/java/net/emustudio/plugins/cpu/rasp/MemoryStub.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.rasp; diff --git a/plugins/cpu/ssem-cpu/build.gradle b/plugins/cpu/ssem-cpu/build.gradle index de4215d54..de29b3971 100644 --- a/plugins/cpu/ssem-cpu/build.gradle +++ b/plugins/cpu/ssem-cpu/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens @@ -11,7 +11,7 @@ buildscript { plugins { id 'java' - id 'net.emustudio.edigen-plugin' version '1.5.2' + id 'net.emustudio.edigen-plugin' version '1.5.3-SNAPSHOT' id 'com.adarshr.test-logger' version '4.0.0' } diff --git a/plugins/cpu/ssem-cpu/src/main/edigen/cpu.eds b/plugins/cpu/ssem-cpu/src/main/edigen/cpu.eds index d1bb95ed9..feb8c0ec0 100644 --- a/plugins/cpu/ssem-cpu/src/main/edigen/cpu.eds +++ b/plugins/cpu/ssem-cpu/src/main/edigen/cpu.eds @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ root instruction, data; diff --git a/plugins/cpu/ssem-cpu/src/main/java/net/emustudio/plugins/cpu/ssem/AutomaticEmulation.java b/plugins/cpu/ssem-cpu/src/main/java/net/emustudio/plugins/cpu/ssem/AutomaticEmulation.java index 174cd34f0..18cd55f43 100644 --- a/plugins/cpu/ssem-cpu/src/main/java/net/emustudio/plugins/cpu/ssem/AutomaticEmulation.java +++ b/plugins/cpu/ssem-cpu/src/main/java/net/emustudio/plugins/cpu/ssem/AutomaticEmulation.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.ssem; diff --git a/plugins/cpu/ssem-cpu/src/main/java/net/emustudio/plugins/cpu/ssem/CpuImpl.java b/plugins/cpu/ssem-cpu/src/main/java/net/emustudio/plugins/cpu/ssem/CpuImpl.java index 28f8ea237..453f632bf 100644 --- a/plugins/cpu/ssem-cpu/src/main/java/net/emustudio/plugins/cpu/ssem/CpuImpl.java +++ b/plugins/cpu/ssem-cpu/src/main/java/net/emustudio/plugins/cpu/ssem/CpuImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.ssem; @@ -10,11 +10,11 @@ import net.emustudio.emulib.plugins.cpu.Disassembler; import net.emustudio.emulib.plugins.memory.MemoryContext; import net.emustudio.emulib.runtime.ApplicationApi; -import net.emustudio.emulib.runtime.interaction.debugger.BreakpointColumn; -import net.emustudio.emulib.runtime.interaction.debugger.DebuggerTable; -import net.emustudio.emulib.runtime.interaction.debugger.MnemoColumn; -import net.emustudio.emulib.runtime.interaction.debugger.OpcodeColumn; import net.emustudio.emulib.runtime.settings.PluginSettings; +import net.emustudio.emulib.runtime.ui.debugger.BreakpointColumn; +import net.emustudio.emulib.runtime.ui.debugger.DebuggerTable; +import net.emustudio.emulib.runtime.ui.debugger.MnemoColumn; +import net.emustudio.emulib.runtime.ui.debugger.OpcodeColumn; import net.emustudio.plugins.cpu.ssem.gui.CpuPanel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -127,11 +127,6 @@ public String getDescription() { return "Emulator of SSEM machine"; } - @Override - public boolean isAutomationSupported() { - return true; - } - @Override public RunState call() { return engine.run(); diff --git a/plugins/cpu/ssem-cpu/src/main/java/net/emustudio/plugins/cpu/ssem/EmulatorEngine.java b/plugins/cpu/ssem-cpu/src/main/java/net/emustudio/plugins/cpu/ssem/EmulatorEngine.java index ec1a62b11..c7f143d98 100644 --- a/plugins/cpu/ssem-cpu/src/main/java/net/emustudio/plugins/cpu/ssem/EmulatorEngine.java +++ b/plugins/cpu/ssem-cpu/src/main/java/net/emustudio/plugins/cpu/ssem/EmulatorEngine.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.ssem; @@ -65,7 +65,7 @@ void reset(int startingPos) { CPU.RunState step() { try { DecodedInstruction instruction = decoder.decode(CI.addAndGet(4)); - int lineAddress = Optional.ofNullable(instruction.getBits(LINE)).orElse(emptyBits).reverseBits().bits * 4; + int lineAddress = Optional.ofNullable(instruction.getBits(LINE)).orElse(emptyBits).reverseBits().number * 4; int opcode = instruction.getImage()[1] & 7; Method instr = DISPATCH_TABLE[opcode]; diff --git a/plugins/cpu/ssem-cpu/src/main/java/net/emustudio/plugins/cpu/ssem/LineColumn.java b/plugins/cpu/ssem-cpu/src/main/java/net/emustudio/plugins/cpu/ssem/LineColumn.java index 065b7523e..84dfc99f3 100644 --- a/plugins/cpu/ssem-cpu/src/main/java/net/emustudio/plugins/cpu/ssem/LineColumn.java +++ b/plugins/cpu/ssem-cpu/src/main/java/net/emustudio/plugins/cpu/ssem/LineColumn.java @@ -1,8 +1,8 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.ssem; -import net.emustudio.emulib.runtime.interaction.debugger.DebuggerColumn; +import net.emustudio.emulib.runtime.ui.debugger.DebuggerColumn; public class LineColumn implements DebuggerColumn { private final static String LINE_FORMAT = "%04X"; @@ -31,9 +31,4 @@ public void setValue(int location, Object value) { public String getValue(int location) { return String.format(LINE_FORMAT, location / 4); } - - @Override - public int getDefaultWidth() { - return -1; - } } diff --git a/plugins/cpu/ssem-cpu/src/main/java/net/emustudio/plugins/cpu/ssem/gui/CpuPanel.java b/plugins/cpu/ssem-cpu/src/main/java/net/emustudio/plugins/cpu/ssem/gui/CpuPanel.java index cee242ed1..14ff3836b 100644 --- a/plugins/cpu/ssem-cpu/src/main/java/net/emustudio/plugins/cpu/ssem/gui/CpuPanel.java +++ b/plugins/cpu/ssem-cpu/src/main/java/net/emustudio/plugins/cpu/ssem/gui/CpuPanel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.ssem.gui; @@ -11,7 +11,7 @@ import java.util.Objects; import static net.emustudio.emulib.runtime.helpers.RadixUtils.formatBinaryString; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.*; +import static net.emustudio.emulib.runtime.ui.Constants.*; public class CpuPanel extends JPanel { private final EmulatorEngine engine; diff --git a/plugins/cpu/ssem-cpu/src/test/java/net/emustudio/plugins/cpu/ssem/CpuImplTest.java b/plugins/cpu/ssem-cpu/src/test/java/net/emustudio/plugins/cpu/ssem/CpuImplTest.java index 8688aa62a..ed6a870b2 100644 --- a/plugins/cpu/ssem-cpu/src/test/java/net/emustudio/plugins/cpu/ssem/CpuImplTest.java +++ b/plugins/cpu/ssem-cpu/src/test/java/net/emustudio/plugins/cpu/ssem/CpuImplTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.ssem; diff --git a/plugins/cpu/ssem-cpu/src/test/java/net/emustudio/plugins/cpu/ssem/DisassemblerTest.java b/plugins/cpu/ssem-cpu/src/test/java/net/emustudio/plugins/cpu/ssem/DisassemblerTest.java index 11bd012fc..1c3d73945 100644 --- a/plugins/cpu/ssem-cpu/src/test/java/net/emustudio/plugins/cpu/ssem/DisassemblerTest.java +++ b/plugins/cpu/ssem-cpu/src/test/java/net/emustudio/plugins/cpu/ssem/DisassemblerTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.ssem; diff --git a/plugins/cpu/ssem-cpu/src/test/java/net/emustudio/plugins/cpu/ssem/EmulatorEngineTest.java b/plugins/cpu/ssem-cpu/src/test/java/net/emustudio/plugins/cpu/ssem/EmulatorEngineTest.java index fa23f7a6b..50a55ce10 100644 --- a/plugins/cpu/ssem-cpu/src/test/java/net/emustudio/plugins/cpu/ssem/EmulatorEngineTest.java +++ b/plugins/cpu/ssem-cpu/src/test/java/net/emustudio/plugins/cpu/ssem/EmulatorEngineTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.ssem; diff --git a/plugins/cpu/z80-cpu/build.gradle b/plugins/cpu/z80-cpu/build.gradle index fe2c8b9de..f42bc45b4 100644 --- a/plugins/cpu/z80-cpu/build.gradle +++ b/plugins/cpu/z80-cpu/build.gradle @@ -1,10 +1,10 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens plugins { id 'java' - id 'net.emustudio.edigen-plugin' version '1.5.2' + id 'net.emustudio.edigen-plugin' version '1.5.3-SNAPSHOT' id 'com.adarshr.test-logger' version '4.0.0' } diff --git a/plugins/cpu/z80-cpu/src/main/edigen/cpu.eds b/plugins/cpu/z80-cpu/src/main/edigen/cpu.eds index d1bb79917..5d90f37b4 100644 --- a/plugins/cpu/z80-cpu/src/main/edigen/cpu.eds +++ b/plugins/cpu/z80-cpu/src/main/edigen/cpu.eds @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ root instruction; diff --git a/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/ContextZ80Impl.java b/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/ContextZ80Impl.java index 2eed73041..a5d52b84b 100644 --- a/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/ContextZ80Impl.java +++ b/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/ContextZ80Impl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80; diff --git a/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/CpuImpl.java b/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/CpuImpl.java index 678de7879..3b729db50 100644 --- a/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/CpuImpl.java +++ b/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/CpuImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80; diff --git a/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/DispatchTables.java b/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/DispatchTables.java index 4a3218e4f..47ac95f62 100644 --- a/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/DispatchTables.java +++ b/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/DispatchTables.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80; diff --git a/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/EmulatorEngine.java b/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/EmulatorEngine.java index 38d3f43ae..da9adcd25 100644 --- a/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/EmulatorEngine.java +++ b/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/EmulatorEngine.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80; diff --git a/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/EmulatorTables.java b/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/EmulatorTables.java index a8f67cc89..7bb3761cb 100644 --- a/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/EmulatorTables.java +++ b/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/EmulatorTables.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80; diff --git a/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/InitializerZ80.java b/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/InitializerZ80.java index 1bbc9e6ff..802733a67 100644 --- a/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/InitializerZ80.java +++ b/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/InitializerZ80.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80; diff --git a/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/InstructionPrinter.java b/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/InstructionPrinter.java index b45cdfa32..39531ed0c 100644 --- a/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/InstructionPrinter.java +++ b/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/InstructionPrinter.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80; diff --git a/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/api/ContextZ80.java b/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/api/ContextZ80.java index 2d277d3b6..4b83078fe 100644 --- a/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/api/ContextZ80.java +++ b/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/api/ContextZ80.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80.api; diff --git a/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/gui/FlagsModel.java b/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/gui/FlagsModel.java index 35d78fa60..d486b7d5b 100644 --- a/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/gui/FlagsModel.java +++ b/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/gui/FlagsModel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80.gui; diff --git a/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/gui/StatusPanel.java b/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/gui/StatusPanel.java index b03b866c6..9d0e817b4 100644 --- a/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/gui/StatusPanel.java +++ b/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/gui/StatusPanel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80.gui; @@ -13,7 +13,7 @@ import static net.emustudio.emulib.runtime.helpers.RadixUtils.formatByteHexString; import static net.emustudio.emulib.runtime.helpers.RadixUtils.formatWordHexString; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.*; +import static net.emustudio.emulib.runtime.ui.Constants.*; public class StatusPanel extends JPanel { private final CpuImpl cpu; diff --git a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/ArithmeticTest.java b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/ArithmeticTest.java index 7f245f3f3..9dc6dfb53 100644 --- a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/ArithmeticTest.java +++ b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/ArithmeticTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80; diff --git a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/BitTest.java b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/BitTest.java index 51a9e1af8..ce03c68a0 100644 --- a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/BitTest.java +++ b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/BitTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80; diff --git a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/ControlTest.java b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/ControlTest.java index 1f6f92903..bd50a5e6d 100644 --- a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/ControlTest.java +++ b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/ControlTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80; diff --git a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/CpuImplTest.java b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/CpuImplTest.java index ae9a9a1fd..d3c154540 100644 --- a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/CpuImplTest.java +++ b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/CpuImplTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80; diff --git a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/DisassemblerTest.java b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/DisassemblerTest.java index fe9943692..a353cfcdd 100644 --- a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/DisassemblerTest.java +++ b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/DisassemblerTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80; diff --git a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/EmulatorTablesGeneration.java b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/EmulatorTablesGeneration.java index 59e3cf954..5a293a860 100644 --- a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/EmulatorTablesGeneration.java +++ b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/EmulatorTablesGeneration.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80; diff --git a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/FakeByteDevice.java b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/FakeByteDevice.java index 8674cfab9..dfa6b4909 100644 --- a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/FakeByteDevice.java +++ b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/FakeByteDevice.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80; diff --git a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/IOTest.java b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/IOTest.java index 920a9baa3..e1223cebf 100644 --- a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/IOTest.java +++ b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/IOTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80; diff --git a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/InstructionsTest.java b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/InstructionsTest.java index c72dc98bf..e8977933e 100644 --- a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/InstructionsTest.java +++ b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/InstructionsTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80; diff --git a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/LogicTest.java b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/LogicTest.java index 826c4eaa8..9f5d8b40d 100644 --- a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/LogicTest.java +++ b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/LogicTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80; diff --git a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/StackTest.java b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/StackTest.java index cde90b627..17b5c805f 100644 --- a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/StackTest.java +++ b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/StackTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80; diff --git a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/TransferTest.java b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/TransferTest.java index e37617156..0f876824f 100644 --- a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/TransferTest.java +++ b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/TransferTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80; diff --git a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/Z80Tests.java b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/Z80Tests.java index 37e9d70d7..2bf2be266 100644 --- a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/Z80Tests.java +++ b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/Z80Tests.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80; diff --git a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/ByteTestBuilder.java b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/ByteTestBuilder.java index 3285ed75c..5da06fb66 100644 --- a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/ByteTestBuilder.java +++ b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/ByteTestBuilder.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80.suite; diff --git a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/CpuRunnerImpl.java b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/CpuRunnerImpl.java index 01a1ffac7..73457113f 100644 --- a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/CpuRunnerImpl.java +++ b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/CpuRunnerImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80.suite; diff --git a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/CpuVerifierImpl.java b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/CpuVerifierImpl.java index 08721296d..361a7129b 100644 --- a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/CpuVerifierImpl.java +++ b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/CpuVerifierImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80.suite; diff --git a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/IntegerTestBuilder.java b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/IntegerTestBuilder.java index 1ce4f850e..fe36a7127 100644 --- a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/IntegerTestBuilder.java +++ b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/IntegerTestBuilder.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80.suite; diff --git a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/Utils.java b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/Utils.java index 71add1c59..ba8ed8290 100644 --- a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/Utils.java +++ b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/Utils.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80.suite; diff --git a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/injectors/Register.java b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/injectors/Register.java index 98ec0887a..2021af4ec 100644 --- a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/injectors/Register.java +++ b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/injectors/Register.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80.suite.injectors; diff --git a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/injectors/RegisterPair.java b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/injectors/RegisterPair.java index 9d205c496..f724fd5f5 100644 --- a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/injectors/RegisterPair.java +++ b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/injectors/RegisterPair.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80.suite.injectors; diff --git a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/injectors/RegisterPair2.java b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/injectors/RegisterPair2.java index 3904272b2..2294953c7 100644 --- a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/injectors/RegisterPair2.java +++ b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/injectors/RegisterPair2.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80.suite.injectors; diff --git a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/injectors/RegisterPairPSW.java b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/injectors/RegisterPairPSW.java index 617837d4a..a13efc2cc 100644 --- a/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/injectors/RegisterPairPSW.java +++ b/plugins/cpu/z80-cpu/src/test/java/net/emustudio/plugins/cpu/zilogZ80/suite/injectors/RegisterPairPSW.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.cpu.zilogZ80.suite.injectors; diff --git a/plugins/device/88-dcdd/build.gradle b/plugins/device/88-dcdd/build.gradle index ed8649a4d..aec141da6 100644 --- a/plugins/device/88-dcdd/build.gradle +++ b/plugins/device/88-dcdd/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/DeviceImpl.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/DeviceImpl.java index a7aec1e89..0a55d0391 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/DeviceImpl.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/DeviceImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd; @@ -7,8 +7,8 @@ import net.emustudio.emulib.plugins.annotations.PluginRoot; import net.emustudio.emulib.plugins.device.AbstractDevice; import net.emustudio.emulib.runtime.ApplicationApi; -import net.emustudio.emulib.runtime.interaction.Dialogs; import net.emustudio.emulib.runtime.settings.PluginSettings; +import net.emustudio.emulib.runtime.ui.Dialogs; import net.emustudio.plugins.cpu.intel8080.api.Context8080; import net.emustudio.plugins.device.mits88dcdd.drive.DriveCollection; import net.emustudio.plugins.device.mits88dcdd.gui.DiskGui; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/DiskSettings.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/DiskSettings.java index 16d5d34c9..fe36bce41 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/DiskSettings.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/DiskSettings.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/Resources.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/Resources.java index c1f8f3928..e01b4f6a4 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/Resources.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/Resources.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cmdline/Cpmfs.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cmdline/Cpmfs.java index 5b09fa0e7..07ae62c5f 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cmdline/Cpmfs.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cmdline/Cpmfs.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.cmdline; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cmdline/Runner.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cmdline/Runner.java index fcceb373e..9f2e192d4 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cmdline/Runner.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cmdline/Runner.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.cmdline; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/CpmFileSystem.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/CpmFileSystem.java index 8c670af83..87310b2e8 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/CpmFileSystem.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/CpmFileSystem.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.cpmfs; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/CpmFormat.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/CpmFormat.java index 17543e5e6..7ce8019aa 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/CpmFormat.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/CpmFormat.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.cpmfs; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/DateFormat.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/DateFormat.java index 6720a7b85..e45b07023 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/DateFormat.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/DateFormat.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.cpmfs; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/DiskParameterBlock.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/DiskParameterBlock.java index 090297f49..27e9fface 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/DiskParameterBlock.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/DiskParameterBlock.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.cpmfs; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/DriveIO.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/DriveIO.java index ddcf2b25c..6feb687a3 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/DriveIO.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/DriveIO.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.cpmfs; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/Position.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/Position.java index ee3bcc3e9..383f5940c 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/Position.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/Position.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.cpmfs; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/entry/CpmEntry.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/entry/CpmEntry.java index 824d5233c..6e1119b21 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/entry/CpmEntry.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/entry/CpmEntry.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.cpmfs.entry; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/entry/CpmFile.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/entry/CpmFile.java index db831d8f4..f6c2e6493 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/entry/CpmFile.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/entry/CpmFile.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.cpmfs.entry; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/entry/CpmNativeDate.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/entry/CpmNativeDate.java index 1ca752ad7..9d79fb7f7 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/entry/CpmNativeDate.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/entry/CpmNativeDate.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.cpmfs.entry; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/entry/CpmPlusDiscLabel.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/entry/CpmPlusDiscLabel.java index 35563dc80..44441d2c7 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/entry/CpmPlusDiscLabel.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/entry/CpmPlusDiscLabel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.cpmfs.entry; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/entry/CpmPlusPassword.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/entry/CpmPlusPassword.java index a6469d158..1436aaa73 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/entry/CpmPlusPassword.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/entry/CpmPlusPassword.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.cpmfs.entry; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/entry/DateStamp.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/entry/DateStamp.java index 40629a79b..0a7760cf9 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/entry/DateStamp.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/entry/DateStamp.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.cpmfs.entry; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/sectorops/Altair8deramp.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/sectorops/Altair8deramp.java index 01cb73441..457126e7e 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/sectorops/Altair8deramp.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/sectorops/Altair8deramp.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.cpmfs.sectorops; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/sectorops/Altair8mits.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/sectorops/Altair8mits.java index 40ec7803c..80a4abb3c 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/sectorops/Altair8mits.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/sectorops/Altair8mits.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.cpmfs.sectorops; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/sectorops/AltairMinidiskDeramp.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/sectorops/AltairMinidiskDeramp.java index fc6e63b68..06ecf1fd6 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/sectorops/AltairMinidiskDeramp.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/sectorops/AltairMinidiskDeramp.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.cpmfs.sectorops; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/sectorops/SectorOps.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/sectorops/SectorOps.java index 9794fcc80..a6e0c896c 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/sectorops/SectorOps.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/cpmfs/sectorops/SectorOps.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.cpmfs.sectorops; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/drive/Drive.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/drive/Drive.java index 050dc6dd5..48c64745a 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/drive/Drive.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/drive/Drive.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.drive; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/drive/DriveCollection.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/drive/DriveCollection.java index 25cc2502b..f52a2248b 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/drive/DriveCollection.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/drive/DriveCollection.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.drive; import net.emustudio.emulib.plugins.PluginInitializationException; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import net.emustudio.plugins.cpu.intel8080.api.Context8080; import net.emustudio.plugins.cpu.intel8080.api.Context8080.CpuPortDevice; import net.emustudio.plugins.device.mits88dcdd.DiskSettings; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/drive/DriveListener.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/drive/DriveListener.java index cee5d5e44..10e49b66b 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/drive/DriveListener.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/drive/DriveListener.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.drive; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/drive/DriveParameters.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/drive/DriveParameters.java index 7cc10c962..bf5d0a1e5 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/drive/DriveParameters.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/drive/DriveParameters.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.drive; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/gui/Constants.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/gui/Constants.java index 03021cc36..18e9a3836 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/gui/Constants.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/gui/Constants.java @@ -1,12 +1,12 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.gui; import javax.swing.*; import java.awt.*; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.FONT_MONOSPACED; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.Constants.FONT_MONOSPACED; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class Constants { public final static String DIALOG_TITLE = "MITS 88-DCDD"; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/gui/DiskGui.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/gui/DiskGui.java index 44f619427..226af95bd 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/gui/DiskGui.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/gui/DiskGui.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.gui; @@ -13,7 +13,7 @@ import java.awt.event.KeyEvent; import java.util.Objects; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.FONT_MONOSPACED; +import static net.emustudio.emulib.runtime.ui.Constants.FONT_MONOSPACED; import static net.emustudio.plugins.device.mits88dcdd.gui.Constants.DIALOG_TITLE; public class DiskGui extends JDialog { diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/gui/DriveButton.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/gui/DriveButton.java index 411a0cf28..df06f91ba 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/gui/DriveButton.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/gui/DriveButton.java @@ -1,10 +1,10 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.gui; import javax.swing.*; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.FONT_MONOSPACED; +import static net.emustudio.emulib.runtime.ui.Constants.FONT_MONOSPACED; import static net.emustudio.plugins.device.mits88dcdd.gui.Constants.ICON_SELECTED; import static net.emustudio.plugins.device.mits88dcdd.gui.Constants.ICON_UNSELECTED; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/gui/SettingsDialog.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/gui/SettingsDialog.java index 129620551..d091abd94 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/gui/SettingsDialog.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/gui/SettingsDialog.java @@ -1,11 +1,11 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.gui; import net.emustudio.emulib.plugins.PluginInitializationException; import net.emustudio.emulib.runtime.helpers.RadixUtils; -import net.emustudio.emulib.runtime.interaction.Dialogs; -import net.emustudio.emulib.runtime.interaction.FileExtensionsFilter; +import net.emustudio.emulib.runtime.ui.Dialogs; +import net.emustudio.emulib.runtime.ui.components.FileExtensionsFilter; import net.emustudio.plugins.device.mits88dcdd.DiskSettings; import net.emustudio.plugins.device.mits88dcdd.drive.DriveCollection; import org.slf4j.Logger; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/ports/ControlPort.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/ports/ControlPort.java index 70bdb1b34..a47c7c1e5 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/ports/ControlPort.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/ports/ControlPort.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.ports; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/ports/DataPort.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/ports/DataPort.java index ef13ef00e..258abe74c 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/ports/DataPort.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/ports/DataPort.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.ports; diff --git a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/ports/StatusPort.java b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/ports/StatusPort.java index 1b313ec56..627f238ad 100644 --- a/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/ports/StatusPort.java +++ b/plugins/device/88-dcdd/src/main/java/net/emustudio/plugins/device/mits88dcdd/ports/StatusPort.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd.ports; diff --git a/plugins/device/88-dcdd/src/test/java/net/emustudio/plugins/device/mits88dcdd/DeviceImplTest.java b/plugins/device/88-dcdd/src/test/java/net/emustudio/plugins/device/mits88dcdd/DeviceImplTest.java index f59f24421..c6a9c04e2 100644 --- a/plugins/device/88-dcdd/src/test/java/net/emustudio/plugins/device/mits88dcdd/DeviceImplTest.java +++ b/plugins/device/88-dcdd/src/test/java/net/emustudio/plugins/device/mits88dcdd/DeviceImplTest.java @@ -1,12 +1,12 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd; import net.emustudio.emulib.plugins.PluginInitializationException; import net.emustudio.emulib.runtime.ApplicationApi; import net.emustudio.emulib.runtime.ContextPool; -import net.emustudio.emulib.runtime.interaction.Dialogs; import net.emustudio.emulib.runtime.settings.PluginSettings; +import net.emustudio.emulib.runtime.ui.Dialogs; import net.emustudio.plugins.cpu.intel8080.api.Context8080; import org.junit.After; import org.junit.Before; diff --git a/plugins/device/88-dcdd/src/test/java/net/emustudio/plugins/device/mits88dcdd/DriveTest.java b/plugins/device/88-dcdd/src/test/java/net/emustudio/plugins/device/mits88dcdd/DriveTest.java index 6fef7a46e..8ca6e63a9 100644 --- a/plugins/device/88-dcdd/src/test/java/net/emustudio/plugins/device/mits88dcdd/DriveTest.java +++ b/plugins/device/88-dcdd/src/test/java/net/emustudio/plugins/device/mits88dcdd/DriveTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88dcdd; diff --git a/plugins/device/88-sio/build.gradle b/plugins/device/88-sio/build.gradle index 6bac053c4..cde29d814 100644 --- a/plugins/device/88-sio/build.gradle +++ b/plugins/device/88-sio/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens diff --git a/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/ControlChannel.java b/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/ControlChannel.java index 3fe572c76..83b44b991 100644 --- a/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/ControlChannel.java +++ b/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/ControlChannel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88sio; diff --git a/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/DataChannel.java b/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/DataChannel.java index f20aa0711..647a3d676 100644 --- a/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/DataChannel.java +++ b/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/DataChannel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88sio; diff --git a/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/DeviceImpl.java b/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/DeviceImpl.java index 8cb8a4f84..f4f43f7e9 100644 --- a/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/DeviceImpl.java +++ b/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/DeviceImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88sio; diff --git a/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/SioUnit.java b/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/SioUnit.java index ba75fb96b..24c7a8910 100644 --- a/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/SioUnit.java +++ b/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/SioUnit.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88sio; diff --git a/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/SioUnitSettings.java b/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/SioUnitSettings.java index 7ccbabcd6..2d70e77e1 100644 --- a/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/SioUnitSettings.java +++ b/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/SioUnitSettings.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88sio; diff --git a/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/UART.java b/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/UART.java index bddccd4ae..786ec5de7 100644 --- a/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/UART.java +++ b/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/UART.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88sio; diff --git a/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/gui/PortListModel.java b/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/gui/PortListModel.java index 14b657525..3a9b2e498 100644 --- a/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/gui/PortListModel.java +++ b/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/gui/PortListModel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88sio.gui; diff --git a/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/gui/SettingsDialog.java b/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/gui/SettingsDialog.java index 65707b173..4f98d7cf5 100644 --- a/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/gui/SettingsDialog.java +++ b/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/gui/SettingsDialog.java @@ -1,8 +1,8 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88sio.gui; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import net.emustudio.plugins.device.mits88sio.SioUnitSettings; import javax.swing.*; @@ -10,7 +10,7 @@ import java.awt.event.KeyEvent; import java.util.Objects; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.FONT_MONOSPACED; +import static net.emustudio.emulib.runtime.ui.Constants.FONT_MONOSPACED; public class SettingsDialog extends JDialog { private final Dialogs dialogs; diff --git a/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/gui/SioGui.java b/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/gui/SioGui.java index b9165a716..6bbda13aa 100644 --- a/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/gui/SioGui.java +++ b/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/gui/SioGui.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88sio.gui; diff --git a/plugins/device/88-sio/src/test/java/net/emustudio/plugins/device/mits88sio/ControlChannelTest.java b/plugins/device/88-sio/src/test/java/net/emustudio/plugins/device/mits88sio/ControlChannelTest.java index 7b48aa485..d3927dbd1 100644 --- a/plugins/device/88-sio/src/test/java/net/emustudio/plugins/device/mits88sio/ControlChannelTest.java +++ b/plugins/device/88-sio/src/test/java/net/emustudio/plugins/device/mits88sio/ControlChannelTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88sio; diff --git a/plugins/device/88-sio/src/test/java/net/emustudio/plugins/device/mits88sio/DataChannelTest.java b/plugins/device/88-sio/src/test/java/net/emustudio/plugins/device/mits88sio/DataChannelTest.java index 8819d6df1..a3b7bd5b9 100644 --- a/plugins/device/88-sio/src/test/java/net/emustudio/plugins/device/mits88sio/DataChannelTest.java +++ b/plugins/device/88-sio/src/test/java/net/emustudio/plugins/device/mits88sio/DataChannelTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88sio; diff --git a/plugins/device/88-sio/src/test/java/net/emustudio/plugins/device/mits88sio/DeviceChannelTest.java b/plugins/device/88-sio/src/test/java/net/emustudio/plugins/device/mits88sio/DeviceChannelTest.java index c4e6b0f31..1b02d5562 100644 --- a/plugins/device/88-sio/src/test/java/net/emustudio/plugins/device/mits88sio/DeviceChannelTest.java +++ b/plugins/device/88-sio/src/test/java/net/emustudio/plugins/device/mits88sio/DeviceChannelTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88sio; diff --git a/plugins/device/88-sio/src/test/java/net/emustudio/plugins/device/mits88sio/DeviceImplTest.java b/plugins/device/88-sio/src/test/java/net/emustudio/plugins/device/mits88sio/DeviceImplTest.java index c3d149555..177ff7935 100644 --- a/plugins/device/88-sio/src/test/java/net/emustudio/plugins/device/mits88sio/DeviceImplTest.java +++ b/plugins/device/88-sio/src/test/java/net/emustudio/plugins/device/mits88sio/DeviceImplTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88sio; diff --git a/plugins/device/88-sio/src/test/java/net/emustudio/plugins/device/mits88sio/SioUnitTest.java b/plugins/device/88-sio/src/test/java/net/emustudio/plugins/device/mits88sio/SioUnitTest.java index b51274aed..a151f4305 100644 --- a/plugins/device/88-sio/src/test/java/net/emustudio/plugins/device/mits88sio/SioUnitTest.java +++ b/plugins/device/88-sio/src/test/java/net/emustudio/plugins/device/mits88sio/SioUnitTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88sio; diff --git a/plugins/device/88-sio/src/test/java/net/emustudio/plugins/device/mits88sio/UARTTest.java b/plugins/device/88-sio/src/test/java/net/emustudio/plugins/device/mits88sio/UARTTest.java index c4a30e9fd..71a908ae2 100644 --- a/plugins/device/88-sio/src/test/java/net/emustudio/plugins/device/mits88sio/UARTTest.java +++ b/plugins/device/88-sio/src/test/java/net/emustudio/plugins/device/mits88sio/UARTTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.mits88sio; diff --git a/plugins/device/abstract-tape/build.gradle b/plugins/device/abstract-tape/build.gradle index 752fe8b55..d90b260c8 100644 --- a/plugins/device/abstract-tape/build.gradle +++ b/plugins/device/abstract-tape/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens diff --git a/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/AbstractTape.java b/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/AbstractTape.java index 8a6ea91ce..21f3d6d6d 100644 --- a/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/AbstractTape.java +++ b/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/AbstractTape.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.abstracttape; diff --git a/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/AbstractTapeContextImpl.java b/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/AbstractTapeContextImpl.java index 7af12dfad..bd0de1d91 100644 --- a/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/AbstractTapeContextImpl.java +++ b/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/AbstractTapeContextImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.abstracttape; diff --git a/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/api/AbstractTapeContext.java b/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/api/AbstractTapeContext.java index 696b81a13..d6989cf09 100644 --- a/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/api/AbstractTapeContext.java +++ b/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/api/AbstractTapeContext.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.abstracttape.api; diff --git a/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/api/TapeSymbol.java b/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/api/TapeSymbol.java index 93be6cd6c..c88a5f4e5 100644 --- a/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/api/TapeSymbol.java +++ b/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/api/TapeSymbol.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.abstracttape.api; diff --git a/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/gui/NiceButton.java b/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/gui/NiceButton.java index e76950687..1758ea71a 100644 --- a/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/gui/NiceButton.java +++ b/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/gui/NiceButton.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.abstracttape.gui; diff --git a/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/gui/SettingsDialog.java b/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/gui/SettingsDialog.java index fd2437dc4..e3828f323 100644 --- a/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/gui/SettingsDialog.java +++ b/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/gui/SettingsDialog.java @@ -1,10 +1,10 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.abstracttape.gui; -import net.emustudio.emulib.runtime.interaction.Dialogs; import net.emustudio.emulib.runtime.settings.CannotUpdateSettingException; import net.emustudio.emulib.runtime.settings.PluginSettings; +import net.emustudio.emulib.runtime.ui.Dialogs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/gui/TapeCellRenderer.java b/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/gui/TapeCellRenderer.java index 3544bd9e7..acbc55031 100644 --- a/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/gui/TapeCellRenderer.java +++ b/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/gui/TapeCellRenderer.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.abstracttape.gui; diff --git a/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/gui/TapeGui.java b/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/gui/TapeGui.java index eb297ca18..88eef5d8b 100644 --- a/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/gui/TapeGui.java +++ b/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/gui/TapeGui.java @@ -1,8 +1,8 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.abstracttape.gui; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import net.emustudio.plugins.device.abstracttape.AbstractTapeContextImpl; import net.emustudio.plugins.device.abstracttape.api.TapeSymbol; @@ -10,8 +10,9 @@ import java.awt.event.KeyEvent; import java.util.Objects; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.FONT_MONOSPACED; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.Constants.FONT_MONOSPACED; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; + public class TapeGui extends JDialog { private static final String ICON_ADD_FIRST = "/net/emustudio/plugins/device/abstracttape/gui/go-up.png"; diff --git a/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/gui/TapeModel.java b/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/gui/TapeModel.java index bc7dc90a5..7e38094ee 100644 --- a/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/gui/TapeModel.java +++ b/plugins/device/abstract-tape/src/main/java/net/emustudio/plugins/device/abstracttape/gui/TapeModel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.abstracttape.gui; diff --git a/plugins/device/abstract-tape/src/test/java/net/emustudio/plugins/device/abstracttape/AbstractTapeTest.java b/plugins/device/abstract-tape/src/test/java/net/emustudio/plugins/device/abstracttape/AbstractTapeTest.java index 687f79d71..39ab51765 100644 --- a/plugins/device/abstract-tape/src/test/java/net/emustudio/plugins/device/abstracttape/AbstractTapeTest.java +++ b/plugins/device/abstract-tape/src/test/java/net/emustudio/plugins/device/abstracttape/AbstractTapeTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.abstracttape; diff --git a/plugins/device/adm3A-terminal/build.gradle b/plugins/device/adm3A-terminal/build.gradle index 752fe8b55..d90b260c8 100644 --- a/plugins/device/adm3A-terminal/build.gradle +++ b/plugins/device/adm3A-terminal/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens diff --git a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/DeviceImpl.java b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/DeviceImpl.java index 86fc05f3f..9218e0c18 100644 --- a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/DeviceImpl.java +++ b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/DeviceImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.adm3a; @@ -11,8 +11,8 @@ import net.emustudio.emulib.runtime.ContextAlreadyRegisteredException; import net.emustudio.emulib.runtime.ContextNotFoundException; import net.emustudio.emulib.runtime.InvalidContextException; -import net.emustudio.emulib.runtime.interaction.GuiUtils; import net.emustudio.emulib.runtime.settings.PluginSettings; +import net.emustudio.emulib.runtime.ui.GUI; import net.emustudio.plugins.device.adm3a.api.ContextAdm3A; import net.emustudio.plugins.device.adm3a.api.Display; import net.emustudio.plugins.device.adm3a.api.Keyboard; @@ -103,7 +103,7 @@ public void showGUI(JFrame parent) { } else if (terminalSettings.isGuiSupported()) { terminalGUI = new TerminalWindow(parent, display, fromTerminalFont(terminalSettings.getFont())); terminalGUI.setAlwaysOnTop(terminalSettings.isAlwaysOnTop()); - GuiUtils.addKeyListener(terminalGUI, (KeyboardGui) keyboard); + GUI.addKeyListenerRecursively(terminalGUI, (KeyboardGui) keyboard); terminalGUI.startPainting(); guiIOset = true; terminalGUI.setVisible(true); diff --git a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/TerminalSettings.java b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/TerminalSettings.java index 922b8eba7..d6a533082 100644 --- a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/TerminalSettings.java +++ b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/TerminalSettings.java @@ -1,10 +1,10 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.adm3a; -import net.emustudio.emulib.runtime.interaction.Dialogs; import net.emustudio.emulib.runtime.settings.CannotUpdateSettingException; import net.emustudio.emulib.runtime.settings.PluginSettings; +import net.emustudio.emulib.runtime.ui.Dialogs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/api/ContextAdm3A.java b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/api/ContextAdm3A.java index ff0591788..8aee44bd7 100644 --- a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/api/ContextAdm3A.java +++ b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/api/ContextAdm3A.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.adm3a.api; diff --git a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/api/Display.java b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/api/Display.java index 98762cf67..baa82e054 100644 --- a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/api/Display.java +++ b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/api/Display.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.adm3a.api; diff --git a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/api/Keyboard.java b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/api/Keyboard.java index 535f76ac1..e740a7dc3 100644 --- a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/api/Keyboard.java +++ b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/api/Keyboard.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.adm3a.api; diff --git a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/gui/DisplayCanvas.java b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/gui/DisplayCanvas.java index d27795c52..56af15997 100644 --- a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/gui/DisplayCanvas.java +++ b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/gui/DisplayCanvas.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.adm3a.gui; diff --git a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/gui/DisplayFont.java b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/gui/DisplayFont.java index 3fb2fa354..94e8a2e5e 100644 --- a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/gui/DisplayFont.java +++ b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/gui/DisplayFont.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.adm3a.gui; diff --git a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/gui/DisplayFontJComboRenderer.java b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/gui/DisplayFontJComboRenderer.java index 84e858290..76c384320 100644 --- a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/gui/DisplayFontJComboRenderer.java +++ b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/gui/DisplayFontJComboRenderer.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.adm3a.gui; diff --git a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/gui/GuiUtilsAdm3A.java b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/gui/GuiUtilsAdm3A.java index 15434bbf1..9a94ab800 100644 --- a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/gui/GuiUtilsAdm3A.java +++ b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/gui/GuiUtilsAdm3A.java @@ -1,14 +1,14 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.adm3a.gui; -import net.emustudio.emulib.runtime.interaction.GuiUtils; - import java.awt.*; +import static net.emustudio.emulib.runtime.ui.GUI.loadFontResource; + public class GuiUtilsAdm3A { public static Font loadFont(DisplayFont displayFont) { - return GuiUtils.loadFontResource(displayFont.path, GuiUtilsAdm3A.class, displayFont.fontSize); + return loadFontResource(displayFont.path, GuiUtilsAdm3A.class, displayFont.fontSize); } } diff --git a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/gui/SettingsDialog.java b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/gui/SettingsDialog.java index 6f9ad796f..4d5f7faaa 100644 --- a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/gui/SettingsDialog.java +++ b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/gui/SettingsDialog.java @@ -1,8 +1,8 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.adm3a.gui; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import net.emustudio.plugins.device.adm3a.TerminalSettings; import javax.swing.*; diff --git a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/gui/TerminalWindow.java b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/gui/TerminalWindow.java index 75f593c49..2400ad2c7 100644 --- a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/gui/TerminalWindow.java +++ b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/gui/TerminalWindow.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.adm3a.gui; @@ -9,7 +9,7 @@ import java.util.Objects; import static java.awt.FlowLayout.LEFT; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class TerminalWindow extends JDialog { private static final String BACKGROUND_IMAGE = "/net/emustudio/plugins/device/adm3a/gui/display.png"; diff --git a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/interaction/Cursor.java b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/interaction/Cursor.java index 7be467a2c..b52ff8ae1 100644 --- a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/interaction/Cursor.java +++ b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/interaction/Cursor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.adm3a.interaction; diff --git a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/interaction/DisplayImpl.java b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/interaction/DisplayImpl.java index c010b6566..d11d672da 100644 --- a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/interaction/DisplayImpl.java +++ b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/interaction/DisplayImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.adm3a.interaction; diff --git a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/interaction/KeyboardFromFile.java b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/interaction/KeyboardFromFile.java index 1a43ace0d..b8e8e9220 100644 --- a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/interaction/KeyboardFromFile.java +++ b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/interaction/KeyboardFromFile.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.adm3a.interaction; diff --git a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/interaction/KeyboardGui.java b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/interaction/KeyboardGui.java index 798fc63f3..7cc775510 100644 --- a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/interaction/KeyboardGui.java +++ b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/interaction/KeyboardGui.java @@ -1,8 +1,8 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.adm3a.interaction; -import net.emustudio.emulib.runtime.interaction.GuiUtils; +import net.emustudio.emulib.runtime.ui.GUI; import net.emustudio.plugins.device.adm3a.api.Keyboard; import java.awt.event.ContainerEvent; @@ -125,12 +125,12 @@ public void keyReleased(KeyEvent e) { @Override public void componentAdded(ContainerEvent e) { - GuiUtils.addKeyListener(e.getChild(), this); + GUI.addKeyListenerRecursively(e.getChild(), this); } @Override public void componentRemoved(ContainerEvent e) { - GuiUtils.removeKeyListener(e.getChild(), this); + GUI.removeKeyListenerRecursively(e.getChild(), this); } @Override diff --git a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/interaction/LoadCursorPosition.java b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/interaction/LoadCursorPosition.java index d018c7518..34195c5f2 100644 --- a/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/interaction/LoadCursorPosition.java +++ b/plugins/device/adm3A-terminal/src/main/java/net/emustudio/plugins/device/adm3a/interaction/LoadCursorPosition.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.adm3a.interaction; diff --git a/plugins/device/adm3A-terminal/src/test/java/net/emustudio/plugins/device/adm3a/DeviceImplTest.java b/plugins/device/adm3A-terminal/src/test/java/net/emustudio/plugins/device/adm3a/DeviceImplTest.java index e14a733c9..7f4e4ecd8 100644 --- a/plugins/device/adm3A-terminal/src/test/java/net/emustudio/plugins/device/adm3a/DeviceImplTest.java +++ b/plugins/device/adm3A-terminal/src/test/java/net/emustudio/plugins/device/adm3a/DeviceImplTest.java @@ -1,11 +1,11 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.adm3a; import net.emustudio.emulib.runtime.ApplicationApi; import net.emustudio.emulib.runtime.ContextPool; -import net.emustudio.emulib.runtime.interaction.Dialogs; import net.emustudio.emulib.runtime.settings.PluginSettings; +import net.emustudio.emulib.runtime.ui.Dialogs; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/plugins/device/adm3A-terminal/src/test/java/net/emustudio/plugins/device/adm3a/api/ContextAdm3ATest.java b/plugins/device/adm3A-terminal/src/test/java/net/emustudio/plugins/device/adm3a/api/ContextAdm3ATest.java index 0c8ab04de..bfd6daf9b 100644 --- a/plugins/device/adm3A-terminal/src/test/java/net/emustudio/plugins/device/adm3a/api/ContextAdm3ATest.java +++ b/plugins/device/adm3A-terminal/src/test/java/net/emustudio/plugins/device/adm3a/api/ContextAdm3ATest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.adm3a.api; diff --git a/plugins/device/adm3A-terminal/src/test/java/net/emustudio/plugins/device/adm3a/interaction/CursorTest.java b/plugins/device/adm3A-terminal/src/test/java/net/emustudio/plugins/device/adm3a/interaction/CursorTest.java index b83857fd1..ed6198665 100644 --- a/plugins/device/adm3A-terminal/src/test/java/net/emustudio/plugins/device/adm3a/interaction/CursorTest.java +++ b/plugins/device/adm3A-terminal/src/test/java/net/emustudio/plugins/device/adm3a/interaction/CursorTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.adm3a.interaction; diff --git a/plugins/device/audiotape-player/build.gradle b/plugins/device/audiotape-player/build.gradle index 02656593a..ec808bb06 100644 --- a/plugins/device/audiotape-player/build.gradle +++ b/plugins/device/audiotape-player/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens diff --git a/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/DeviceImpl.java b/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/DeviceImpl.java index 8f9406d03..4c154fe2b 100644 --- a/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/DeviceImpl.java +++ b/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/DeviceImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.audiotape_player; diff --git a/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/TapePlaybackController.java b/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/TapePlaybackController.java index 3c0adc4d1..cd3f574bc 100644 --- a/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/TapePlaybackController.java +++ b/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/TapePlaybackController.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.audiotape_player; diff --git a/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/TapePlaybackImpl.java b/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/TapePlaybackImpl.java index 66f779e0c..24ac302bf 100644 --- a/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/TapePlaybackImpl.java +++ b/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/TapePlaybackImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.audiotape_player; diff --git a/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/gui/TapePlayerGui.java b/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/gui/TapePlayerGui.java index c4b87aba7..62c67003d 100644 --- a/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/gui/TapePlayerGui.java +++ b/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/gui/TapePlayerGui.java @@ -1,11 +1,11 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.audiotape_player.gui; -import net.emustudio.emulib.runtime.interaction.BrowseButton; -import net.emustudio.emulib.runtime.interaction.CachedComboBoxModel; -import net.emustudio.emulib.runtime.interaction.Dialogs; -import net.emustudio.emulib.runtime.interaction.ShortenedString; +import net.emustudio.emulib.runtime.ui.Dialogs; +import net.emustudio.emulib.runtime.ui.GUI; +import net.emustudio.emulib.runtime.ui.ShortenedString; +import net.emustudio.emulib.runtime.ui.components.CachedComboBoxModel; import net.emustudio.plugins.device.audiotape_player.TapePlaybackController; import net.miginfocom.swing.MigLayout; @@ -55,7 +55,7 @@ public TapePlayerGui(JFrame parent, Dialogs dialogs, TapePlaybackController cont Objects.requireNonNull(dialogs); this.controller = Objects.requireNonNull(controller); - btnBrowse = new BrowseButton(dialogs, "Select Directory", "Select", p -> { + btnBrowse = GUI.buttonBrowseDirectories(dialogs, "Select Directory", "Select", p -> { ShortenedString ps = new ShortenedString<>(p, Path::toString); ps.deriveMaxStringLength(cmbDirs, cmbDirs.getWidth() - 36); cmbDirsModel.add(ps); diff --git a/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/gui/TapesListModel.java b/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/gui/TapesListModel.java index d57ac54c3..25a677679 100644 --- a/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/gui/TapesListModel.java +++ b/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/gui/TapesListModel.java @@ -1,8 +1,8 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.audiotape_player.gui; -import net.emustudio.emulib.runtime.interaction.ShortenedString; +import net.emustudio.emulib.runtime.ui.ShortenedString; import net.emustudio.plugins.device.audiotape_player.loaders.Loader; import net.jcip.annotations.NotThreadSafe; import org.slf4j.Logger; diff --git a/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/gui/TapesListRenderer.java b/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/gui/TapesListRenderer.java index f9e35fa45..8e3b5139c 100644 --- a/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/gui/TapesListRenderer.java +++ b/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/gui/TapesListRenderer.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.audiotape_player.gui; @@ -6,7 +6,7 @@ import java.awt.*; import java.util.Objects; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.*; +import static net.emustudio.emulib.runtime.ui.Constants.*; public class TapesListRenderer extends JLabel implements ListCellRenderer { diff --git a/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/loaders/Loader.java b/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/loaders/Loader.java index 0b64953b2..2cf9cfad1 100644 --- a/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/loaders/Loader.java +++ b/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/loaders/Loader.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.audiotape_player.loaders; diff --git a/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/loaders/TapLoader.java b/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/loaders/TapLoader.java index 5efb381b7..a691c55f5 100644 --- a/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/loaders/TapLoader.java +++ b/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/loaders/TapLoader.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.audiotape_player.loaders; diff --git a/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/loaders/TapTzxHeader.java b/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/loaders/TapTzxHeader.java index ef1854b5b..b677689c3 100644 --- a/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/loaders/TapTzxHeader.java +++ b/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/loaders/TapTzxHeader.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.audiotape_player.loaders; diff --git a/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/loaders/TzxLoader.java b/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/loaders/TzxLoader.java index 733e24dcc..b5a3440a9 100644 --- a/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/loaders/TzxLoader.java +++ b/plugins/device/audiotape-player/src/main/java/net/emustudio/plugins/device/audiotape_player/loaders/TzxLoader.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.audiotape_player.loaders; diff --git a/plugins/device/simh-pseudo/build.gradle b/plugins/device/simh-pseudo/build.gradle index 9648d6d41..11ffa8dbe 100644 --- a/plugins/device/simh-pseudo/build.gradle +++ b/plugins/device/simh-pseudo/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/Commands.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/Commands.java index 9ed434d52..06b085cee 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/Commands.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/Commands.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/CpmUtils.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/CpmUtils.java index 1a78a4d46..eeca89e3f 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/CpmUtils.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/CpmUtils.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/DeviceImpl.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/DeviceImpl.java index d1d9f008a..b1fe974e0 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/DeviceImpl.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/DeviceImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/PseudoContext.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/PseudoContext.java index f274f67d6..ad0135718 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/PseudoContext.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/PseudoContext.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/AttachPTP.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/AttachPTP.java index 7d94bfea8..555b65754 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/AttachPTP.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/AttachPTP.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/AttachPTR.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/AttachPTR.java index bf00e8769..95ba99814 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/AttachPTR.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/AttachPTR.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/Command.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/Command.java index af469cdfa..fdaf721f4 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/Command.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/Command.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/DetachPTP.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/DetachPTP.java index 0fd35deb8..e2867fe7b 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/DetachPTP.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/DetachPTP.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/DetachPTR.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/DetachPTR.java index f483259bd..81ba08cd6 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/DetachPTR.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/DetachPTR.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GenInterrupt.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GenInterrupt.java index 218bf8480..eb0944023 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GenInterrupt.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GenInterrupt.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetBankSelect.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetBankSelect.java index 2f1ec911a..77465f442 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetBankSelect.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetBankSelect.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetCPUClockFrequency.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetCPUClockFrequency.java index 69c4b8e23..765730a4e 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetCPUClockFrequency.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetCPUClockFrequency.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetClockCPM3.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetClockCPM3.java index 4920dd78f..aa97d02f6 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetClockCPM3.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetClockCPM3.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetClockZSDOS.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetClockZSDOS.java index 56ed16887..399b88006 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetClockZSDOS.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetClockZSDOS.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetCommon.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetCommon.java index a84f45bb6..e1e7e1b8a 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetCommon.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetCommon.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetHostFilenames.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetHostFilenames.java index c2ec1fb7e..bf4f20e50 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetHostFilenames.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetHostFilenames.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetHostOSPathSeparator.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetHostOSPathSeparator.java index 0d414e9e7..c45df1226 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetHostOSPathSeparator.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetHostOSPathSeparator.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetSimhVersion.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetSimhVersion.java index ffd25b450..9f6842c66 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetSimhVersion.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/GetSimhVersion.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/HasBankedMemory.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/HasBankedMemory.java index da8ba3004..cc050cffd 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/HasBankedMemory.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/HasBankedMemory.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/PrintTime.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/PrintTime.java index 6f6f5a6e2..3b027d6a5 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/PrintTime.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/PrintTime.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/ReadStopWatch.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/ReadStopWatch.java index eacd317e8..69003833b 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/ReadStopWatch.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/ReadStopWatch.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/ReadURL.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/ReadURL.java index 07e4550d2..d09c5c472 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/ReadURL.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/ReadURL.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/ResetPTR.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/ResetPTR.java index 272503425..98b77dbe7 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/ResetPTR.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/ResetPTR.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/ResetSimhInterface.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/ResetSimhInterface.java index 797c2761a..fd61035f9 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/ResetSimhInterface.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/ResetSimhInterface.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/ResetStopWatch.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/ResetStopWatch.java index 85e75a490..73167b3cc 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/ResetStopWatch.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/ResetStopWatch.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SIMHSleep.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SIMHSleep.java index 0ace9e1e4..98cd8d791 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SIMHSleep.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SIMHSleep.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/Set8080CPU.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/Set8080CPU.java index fb9ad3c9e..8cd8d7d08 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/Set8080CPU.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/Set8080CPU.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetBankSelect.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetBankSelect.java index 3e05c61c6..dbd72acac 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetBankSelect.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetBankSelect.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetCPUClockFrequency.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetCPUClockFrequency.java index b20330e78..ff92e9b80 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetCPUClockFrequency.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetCPUClockFrequency.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetClockCPM3.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetClockCPM3.java index 6e0ab3672..d0c36da6d 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetClockCPM3.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetClockCPM3.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetClockZSDOS.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetClockZSDOS.java index 0bb27c711..f69ff71a0 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetClockZSDOS.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetClockZSDOS.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetTimerDelta.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetTimerDelta.java index e29f80a09..33ac9e24d 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetTimerDelta.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetTimerDelta.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetTimerInterruptAdr.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetTimerInterruptAdr.java index 2d0022031..fcfdb2174 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetTimerInterruptAdr.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetTimerInterruptAdr.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetZ80CPU.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetZ80CPU.java index bfbc34460..38bfcbf6e 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetZ80CPU.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/SetZ80CPU.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/ShowTimer.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/ShowTimer.java index fa4ba780b..d67b0dba8 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/ShowTimer.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/ShowTimer.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/StartTimer.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/StartTimer.java index 5f86f2132..be4f2e455 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/StartTimer.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/StartTimer.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/StartTimerInterrupts.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/StartTimerInterrupts.java index 6112c8ac2..ab5fb628f 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/StartTimerInterrupts.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/StartTimerInterrupts.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/StopTimer.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/StopTimer.java index 229de8deb..260b87e6c 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/StopTimer.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/StopTimer.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/StopTimerInterrupts.java b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/StopTimerInterrupts.java index 96abcb0df..9053d9e71 100644 --- a/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/StopTimerInterrupts.java +++ b/plugins/device/simh-pseudo/src/main/java/net/emustudio/plugins/device/simh/commands/StopTimerInterrupts.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh.commands; diff --git a/plugins/device/simh-pseudo/src/test/java/net/emustudio/plugins/device/simh/DeviceImplTest.java b/plugins/device/simh-pseudo/src/test/java/net/emustudio/plugins/device/simh/DeviceImplTest.java index fb5b676d1..7fd391241 100644 --- a/plugins/device/simh-pseudo/src/test/java/net/emustudio/plugins/device/simh/DeviceImplTest.java +++ b/plugins/device/simh-pseudo/src/test/java/net/emustudio/plugins/device/simh/DeviceImplTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.simh; diff --git a/plugins/device/ssem-display/build.gradle b/plugins/device/ssem-display/build.gradle index 9fe7dee2b..66cc65853 100644 --- a/plugins/device/ssem-display/build.gradle +++ b/plugins/device/ssem-display/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens diff --git a/plugins/device/ssem-display/src/main/java/net/emustudio/plugins/device/ssem/display/DeviceImpl.java b/plugins/device/ssem-display/src/main/java/net/emustudio/plugins/device/ssem/display/DeviceImpl.java index 535949431..0c0e29fd0 100644 --- a/plugins/device/ssem-display/src/main/java/net/emustudio/plugins/device/ssem/display/DeviceImpl.java +++ b/plugins/device/ssem-display/src/main/java/net/emustudio/plugins/device/ssem/display/DeviceImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.ssem.display; diff --git a/plugins/device/ssem-display/src/main/java/net/emustudio/plugins/device/ssem/display/DisplayGui.java b/plugins/device/ssem-display/src/main/java/net/emustudio/plugins/device/ssem/display/DisplayGui.java index e538a52c9..6a6bf2509 100644 --- a/plugins/device/ssem-display/src/main/java/net/emustudio/plugins/device/ssem/display/DisplayGui.java +++ b/plugins/device/ssem-display/src/main/java/net/emustudio/plugins/device/ssem/display/DisplayGui.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.ssem.display; diff --git a/plugins/device/ssem-display/src/main/java/net/emustudio/plugins/device/ssem/display/DisplayPanel.java b/plugins/device/ssem-display/src/main/java/net/emustudio/plugins/device/ssem/display/DisplayPanel.java index b53edfd69..2e5ca0987 100644 --- a/plugins/device/ssem-display/src/main/java/net/emustudio/plugins/device/ssem/display/DisplayPanel.java +++ b/plugins/device/ssem-display/src/main/java/net/emustudio/plugins/device/ssem/display/DisplayPanel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.ssem.display; diff --git a/plugins/device/ssem-display/src/test/java/net/emustudio/plugins/device/ssem/display/DeviceImplTest.java b/plugins/device/ssem-display/src/test/java/net/emustudio/plugins/device/ssem/display/DeviceImplTest.java index 2e4879d25..151fb0546 100644 --- a/plugins/device/ssem-display/src/test/java/net/emustudio/plugins/device/ssem/display/DeviceImplTest.java +++ b/plugins/device/ssem-display/src/test/java/net/emustudio/plugins/device/ssem/display/DeviceImplTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.ssem.display; diff --git a/plugins/device/vt100-terminal/build.gradle b/plugins/device/vt100-terminal/build.gradle index d98a8cc94..34dc1198c 100644 --- a/plugins/device/vt100-terminal/build.gradle +++ b/plugins/device/vt100-terminal/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens diff --git a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/DeviceImpl.java b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/DeviceImpl.java index bcafa806c..005adcf0e 100644 --- a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/DeviceImpl.java +++ b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/DeviceImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.vt100; @@ -11,8 +11,8 @@ import net.emustudio.emulib.runtime.ContextAlreadyRegisteredException; import net.emustudio.emulib.runtime.ContextNotFoundException; import net.emustudio.emulib.runtime.InvalidContextException; -import net.emustudio.emulib.runtime.interaction.GuiUtils; import net.emustudio.emulib.runtime.settings.PluginSettings; +import net.emustudio.emulib.runtime.ui.GUI; import net.emustudio.plugins.cpu.brainduck.BrainCPUContext; import net.emustudio.plugins.device.vt100.api.ContextVt100; import net.emustudio.plugins.device.vt100.api.Keyboard; @@ -140,7 +140,7 @@ public void showGUI(JFrame parent) { terminalGUI.setVisible(true); } else if (terminalSettings.isGuiSupported()) { terminalGUI = new TerminalWindow(parent, display, applicationApi.getDialogs(), (KeyboardGui) keyboard); - GuiUtils.addKeyListener(terminalGUI, (KeyboardGui) keyboard); + GUI.addKeyListenerRecursively(terminalGUI, (KeyboardGui) keyboard); terminalGUI.startPainting(); guiIOset = true; terminalGUI.setVisible(true); diff --git a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/TerminalSettings.java b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/TerminalSettings.java index 288cc7946..85204db47 100644 --- a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/TerminalSettings.java +++ b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/TerminalSettings.java @@ -1,20 +1,18 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.vt100; -import net.emustudio.emulib.runtime.interaction.Dialogs; import net.emustudio.emulib.runtime.settings.CannotUpdateSettingException; import net.emustudio.emulib.runtime.settings.PluginSettings; +import net.emustudio.emulib.runtime.ui.Dialogs; import net.jcip.annotations.NotThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import java.util.concurrent.CopyOnWriteArrayList; @NotThreadSafe public class TerminalSettings { diff --git a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/Vt100StateMachine.java b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/Vt100StateMachine.java index 1c2aa43c3..7cdca71df 100644 --- a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/Vt100StateMachine.java +++ b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/Vt100StateMachine.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.vt100; diff --git a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/api/ContextVt100.java b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/api/ContextVt100.java index 0a86ec6be..a07a63f05 100644 --- a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/api/ContextVt100.java +++ b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/api/ContextVt100.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.vt100.api; diff --git a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/api/Display.java b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/api/Display.java index f7506fd4d..2dd691b4d 100644 --- a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/api/Display.java +++ b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/api/Display.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.vt100.api; diff --git a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/api/Keyboard.java b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/api/Keyboard.java index 684c83e8a..35179da7a 100644 --- a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/api/Keyboard.java +++ b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/api/Keyboard.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.vt100.api; diff --git a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/gui/DisplayCanvas.java b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/gui/DisplayCanvas.java index 4726d292d..15f341096 100644 --- a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/gui/DisplayCanvas.java +++ b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/gui/DisplayCanvas.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.vt100.gui; diff --git a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/gui/SettingsDialog.java b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/gui/SettingsDialog.java index c04b59ec6..9f6858dbd 100644 --- a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/gui/SettingsDialog.java +++ b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/gui/SettingsDialog.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.vt100.gui; import net.emustudio.emulib.runtime.helpers.RadixUtils; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import net.emustudio.plugins.device.vt100.TerminalSettings; import java.awt.*; diff --git a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/gui/TerminalWindow.java b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/gui/TerminalWindow.java index 38ec59677..993b1949b 100644 --- a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/gui/TerminalWindow.java +++ b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/gui/TerminalWindow.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.vt100.gui; import net.emustudio.emulib.runtime.helpers.RadixUtils; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import net.emustudio.plugins.device.vt100.interaction.DisplayImpl; import net.emustudio.plugins.device.vt100.interaction.KeyboardGui; @@ -12,7 +12,7 @@ import java.util.Objects; import java.util.StringTokenizer; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class TerminalWindow extends JDialog { private final Dialogs dialogs; diff --git a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/interaction/Cursor.java b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/interaction/Cursor.java index e856b68a2..1f8f3a8fa 100644 --- a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/interaction/Cursor.java +++ b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/interaction/Cursor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.vt100.interaction; diff --git a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/interaction/DisplayImpl.java b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/interaction/DisplayImpl.java index f635bccb7..0b541fdfd 100644 --- a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/interaction/DisplayImpl.java +++ b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/interaction/DisplayImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.vt100.interaction; diff --git a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/interaction/KeyboardFromFile.java b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/interaction/KeyboardFromFile.java index a209bf90b..0df822359 100644 --- a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/interaction/KeyboardFromFile.java +++ b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/interaction/KeyboardFromFile.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.vt100.interaction; diff --git a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/interaction/KeyboardGui.java b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/interaction/KeyboardGui.java index 7994140f5..8757d1a55 100644 --- a/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/interaction/KeyboardGui.java +++ b/plugins/device/vt100-terminal/src/main/java/net/emustudio/plugins/device/vt100/interaction/KeyboardGui.java @@ -1,8 +1,8 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.vt100.interaction; -import net.emustudio.emulib.runtime.interaction.GuiUtils; +import net.emustudio.emulib.runtime.ui.GUI; import net.emustudio.plugins.device.vt100.api.Keyboard; import net.jcip.annotations.ThreadSafe; @@ -35,12 +35,12 @@ public void keyReleased(KeyEvent e) { @Override public void componentAdded(ContainerEvent e) { - GuiUtils.addKeyListener(e.getChild(), this); + GUI.addKeyListenerRecursively(e.getChild(), this); } @Override public void componentRemoved(ContainerEvent e) { - GuiUtils.removeKeyListener(e.getChild(), this); + GUI.removeKeyListenerRecursively(e.getChild(), this); } @Override diff --git a/plugins/device/vt100-terminal/src/test/java/net/emustudio/plugins/device/vt100/DeviceImplTest.java b/plugins/device/vt100-terminal/src/test/java/net/emustudio/plugins/device/vt100/DeviceImplTest.java index d46aebf70..04766e942 100644 --- a/plugins/device/vt100-terminal/src/test/java/net/emustudio/plugins/device/vt100/DeviceImplTest.java +++ b/plugins/device/vt100-terminal/src/test/java/net/emustudio/plugins/device/vt100/DeviceImplTest.java @@ -1,11 +1,11 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.vt100; import net.emustudio.emulib.runtime.ApplicationApi; import net.emustudio.emulib.runtime.ContextPool; -import net.emustudio.emulib.runtime.interaction.Dialogs; import net.emustudio.emulib.runtime.settings.PluginSettings; +import net.emustudio.emulib.runtime.ui.Dialogs; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/plugins/device/vt100-terminal/src/test/java/net/emustudio/plugins/device/vt100/api/ContextVt100Test.java b/plugins/device/vt100-terminal/src/test/java/net/emustudio/plugins/device/vt100/api/ContextVt100Test.java index a12dd058c..264314738 100644 --- a/plugins/device/vt100-terminal/src/test/java/net/emustudio/plugins/device/vt100/api/ContextVt100Test.java +++ b/plugins/device/vt100-terminal/src/test/java/net/emustudio/plugins/device/vt100/api/ContextVt100Test.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.vt100.api; diff --git a/plugins/device/vt100-terminal/src/test/java/net/emustudio/plugins/device/vt100/interaction/CursorTest.java b/plugins/device/vt100-terminal/src/test/java/net/emustudio/plugins/device/vt100/interaction/CursorTest.java index 20ef89302..e36f59f91 100644 --- a/plugins/device/vt100-terminal/src/test/java/net/emustudio/plugins/device/vt100/interaction/CursorTest.java +++ b/plugins/device/vt100-terminal/src/test/java/net/emustudio/plugins/device/vt100/interaction/CursorTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.vt100.interaction; diff --git a/plugins/device/zxspectrum-bus/build.gradle b/plugins/device/zxspectrum-bus/build.gradle index 580df6417..0f2fdcd3a 100644 --- a/plugins/device/zxspectrum-bus/build.gradle +++ b/plugins/device/zxspectrum-bus/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens diff --git a/plugins/device/zxspectrum-bus/src/main/java/net/emustudio/plugins/device/zxspectrum/bus/DeviceImpl.java b/plugins/device/zxspectrum-bus/src/main/java/net/emustudio/plugins/device/zxspectrum/bus/DeviceImpl.java index 1e0be0bb3..548c11fda 100644 --- a/plugins/device/zxspectrum-bus/src/main/java/net/emustudio/plugins/device/zxspectrum/bus/DeviceImpl.java +++ b/plugins/device/zxspectrum-bus/src/main/java/net/emustudio/plugins/device/zxspectrum/bus/DeviceImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.zxspectrum.bus; diff --git a/plugins/device/zxspectrum-bus/src/main/java/net/emustudio/plugins/device/zxspectrum/bus/ZxSpectrumBusImpl.java b/plugins/device/zxspectrum-bus/src/main/java/net/emustudio/plugins/device/zxspectrum/bus/ZxSpectrumBusImpl.java index ed11a99b2..be5bff0bc 100644 --- a/plugins/device/zxspectrum-bus/src/main/java/net/emustudio/plugins/device/zxspectrum/bus/ZxSpectrumBusImpl.java +++ b/plugins/device/zxspectrum-bus/src/main/java/net/emustudio/plugins/device/zxspectrum/bus/ZxSpectrumBusImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.zxspectrum.bus; diff --git a/plugins/device/zxspectrum-bus/src/main/java/net/emustudio/plugins/device/zxspectrum/bus/api/ZxSpectrumBus.java b/plugins/device/zxspectrum-bus/src/main/java/net/emustudio/plugins/device/zxspectrum/bus/api/ZxSpectrumBus.java index 0f62338b0..2d5684a31 100644 --- a/plugins/device/zxspectrum-bus/src/main/java/net/emustudio/plugins/device/zxspectrum/bus/api/ZxSpectrumBus.java +++ b/plugins/device/zxspectrum-bus/src/main/java/net/emustudio/plugins/device/zxspectrum/bus/api/ZxSpectrumBus.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.zxspectrum.bus.api; diff --git a/plugins/device/zxspectrum-ula/build.gradle b/plugins/device/zxspectrum-ula/build.gradle index c1b3efe0e..7f0d8621d 100644 --- a/plugins/device/zxspectrum-ula/build.gradle +++ b/plugins/device/zxspectrum-ula/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens diff --git a/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/DeviceImpl.java b/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/DeviceImpl.java index d4bc9d0cb..92be0dad6 100644 --- a/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/DeviceImpl.java +++ b/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/DeviceImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.zxspectrum.ula; diff --git a/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/PassedCyclesMediator.java b/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/PassedCyclesMediator.java index a50892d5e..6bb330b09 100644 --- a/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/PassedCyclesMediator.java +++ b/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/PassedCyclesMediator.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.zxspectrum.ula; diff --git a/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/ULA.java b/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/ULA.java index d7e43c843..6ddcf4bcb 100644 --- a/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/ULA.java +++ b/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/ULA.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.zxspectrum.ula; @@ -248,7 +248,7 @@ public boolean onKeyEvent(KeyEvent e) { // shift / alt / ctrl are visible in modifiersEx only if pressed = true boolean symShift = (e.getModifiersEx() & (KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK)) != 0; boolean shift = (e.getModifiersEx() & (KeyEvent.SHIFT_DOWN_MASK)) != 0; - + Byte[] command = CHAR_MAPPING.get(e.getKeyCode()); if (command != null) { if (command[2] == 1 || (command[2] == -1 && shift)) { diff --git a/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/ZxParameters.java b/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/ZxParameters.java index 904dd98c9..b47578b6c 100644 --- a/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/ZxParameters.java +++ b/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/ZxParameters.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.zxspectrum.ula; diff --git a/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/gui/DisplayCanvas.java b/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/gui/DisplayCanvas.java index 02eca5b7d..f0a4d1626 100644 --- a/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/gui/DisplayCanvas.java +++ b/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/gui/DisplayCanvas.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.zxspectrum.ula.gui; diff --git a/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/gui/DisplayWindow.java b/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/gui/DisplayWindow.java index 8391a7ef6..d1be44cad 100644 --- a/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/gui/DisplayWindow.java +++ b/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/gui/DisplayWindow.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.zxspectrum.ula.gui; diff --git a/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/gui/KeyboardCanvas.java b/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/gui/KeyboardCanvas.java index 382adaf63..710ae47e9 100644 --- a/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/gui/KeyboardCanvas.java +++ b/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/gui/KeyboardCanvas.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.zxspectrum.ula.gui; diff --git a/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/gui/KeyboardDispatcher.java b/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/gui/KeyboardDispatcher.java index 28f13ba63..f4a5bca13 100644 --- a/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/gui/KeyboardDispatcher.java +++ b/plugins/device/zxspectrum-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/gui/KeyboardDispatcher.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.device.zxspectrum.ula.gui; diff --git a/plugins/memory/byte-mem/build.gradle b/plugins/memory/byte-mem/build.gradle index 05264ee55..da581de7a 100644 --- a/plugins/memory/byte-mem/build.gradle +++ b/plugins/memory/byte-mem/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/MemoryContextImpl.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/MemoryContextImpl.java index 0a2983f0e..60f69b9ec 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/MemoryContextImpl.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/MemoryContextImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem; diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/MemoryImpl.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/MemoryImpl.java index 07c16f7fa..bf57f20b1 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/MemoryImpl.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/MemoryImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem; diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/RangeTree.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/RangeTree.java index 1295881be..e00d78e6f 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/RangeTree.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/RangeTree.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem; diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/api/ByteMemoryContext.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/api/ByteMemoryContext.java index 69a84f207..94330fef7 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/api/ByteMemoryContext.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/api/ByteMemoryContext.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.api; diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/Constants.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/Constants.java index 978749ed7..8b0ae5486 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/Constants.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/Constants.java @@ -1,8 +1,8 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.gui; -import net.emustudio.emulib.runtime.interaction.FileExtensionsFilter; +import net.emustudio.emulib.runtime.ui.components.FileExtensionsFilter; import java.awt.*; import java.util.List; diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/FindSequenceDialog.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/FindSequenceDialog.java index 3898cd397..d6d42235f 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/FindSequenceDialog.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/FindSequenceDialog.java @@ -1,8 +1,8 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.gui; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import net.emustudio.plugins.memory.bytemem.gui.actions.find_sequence.PerformFindSequenceAction; import net.emustudio.plugins.memory.bytemem.gui.table.MemoryTableModel; diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/KeyboardHandler.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/KeyboardHandler.java index afff98013..4a4ea4f81 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/KeyboardHandler.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/KeyboardHandler.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.gui; diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/MemoryGui.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/MemoryGui.java index b9056edf9..f0631b726 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/MemoryGui.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/MemoryGui.java @@ -1,10 +1,10 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.gui; -import net.emustudio.emulib.runtime.interaction.Dialogs; -import net.emustudio.emulib.runtime.interaction.ToolbarButton; import net.emustudio.emulib.runtime.settings.PluginSettings; +import net.emustudio.emulib.runtime.ui.Dialogs; +import net.emustudio.emulib.runtime.ui.GUI; import net.emustudio.plugins.memory.bytemem.MemoryContextImpl; import net.emustudio.plugins.memory.bytemem.MemoryImpl; import net.emustudio.plugins.memory.bytemem.gui.actions.*; @@ -14,8 +14,6 @@ import javax.swing.*; import java.awt.*; import java.awt.event.KeyEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; import java.util.Objects; import static javax.swing.Action.SHORT_DESCRIPTION; @@ -155,17 +153,17 @@ private void initComponents() { toolBar.setFloatable(false); toolBar.setRollover(true); - toolBar.add(new ToolbarButton(loadImageAction)); - toolBar.add(new ToolbarButton(dumpMemoryAction)); + toolBar.add(GUI.toolbarButton(loadImageAction)); + toolBar.add(GUI.toolbarButton(dumpMemoryAction)); toolBar.addSeparator(); - toolBar.add(new ToolbarButton(gotoAddressAction)); - toolBar.add(new ToolbarButton(findSequenceAction)); + toolBar.add(GUI.toolbarButton(gotoAddressAction)); + toolBar.add(GUI.toolbarButton(findSequenceAction)); toolBar.addSeparator(); toolBar.add(btnAsciiMode); toolBar.addSeparator(); - toolBar.add(new ToolbarButton(eraseMemoryAction)); + toolBar.add(GUI.toolbarButton(eraseMemoryAction)); toolBar.addSeparator(); - toolBar.add(new ToolbarButton(settingsAction)); + toolBar.add(GUI.toolbarButton(settingsAction)); splitPane.setDividerLocation(390); splitPane.setOrientation(JSplitPane.VERTICAL_SPLIT); diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/MouseHandler.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/MouseHandler.java index dde492cfb..ad9be44ed 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/MouseHandler.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/MouseHandler.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.gui; diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/SelectBankAddressDialog.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/SelectBankAddressDialog.java index e43082619..f0af352af 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/SelectBankAddressDialog.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/SelectBankAddressDialog.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.gui; import net.emustudio.emulib.runtime.helpers.RadixUtils; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import javax.swing.*; import java.awt.event.ActionEvent; diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/SettingsDialog.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/SettingsDialog.java index bebe27d7e..8c79301e0 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/SettingsDialog.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/SettingsDialog.java @@ -1,11 +1,11 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.gui; import net.emustudio.emulib.runtime.helpers.RadixUtils; -import net.emustudio.emulib.runtime.interaction.Dialogs; import net.emustudio.emulib.runtime.settings.CannotUpdateSettingException; import net.emustudio.emulib.runtime.settings.PluginSettings; +import net.emustudio.emulib.runtime.ui.Dialogs; import net.emustudio.plugins.memory.bytemem.MemoryContextImpl; import net.emustudio.plugins.memory.bytemem.MemoryImpl; import net.emustudio.plugins.memory.bytemem.RangeTree; diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/AsciiModeAction.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/AsciiModeAction.java index 209c068ab..dc0ac8fe6 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/AsciiModeAction.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/AsciiModeAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.gui.actions; @@ -8,7 +8,7 @@ import java.awt.event.ActionEvent; import java.util.Objects; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class AsciiModeAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/plugins/memory/bytemem/gui/ascii-mode.png"; diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/DumpMemoryAction.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/DumpMemoryAction.java index 812c3a8c8..8d15fa1ea 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/DumpMemoryAction.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/DumpMemoryAction.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.gui.actions; -import net.emustudio.emulib.runtime.interaction.Dialogs; -import net.emustudio.emulib.runtime.interaction.FileExtensionsFilter; +import net.emustudio.emulib.runtime.ui.Dialogs; +import net.emustudio.emulib.runtime.ui.components.FileExtensionsFilter; import net.emustudio.plugins.memory.bytemem.api.ByteMemoryContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Optional; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class DumpMemoryAction extends AbstractAction { private final static Logger LOGGER = LoggerFactory.getLogger(DumpMemoryAction.class); diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/EraseMemoryAction.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/EraseMemoryAction.java index 4f3add2fe..5199ab155 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/EraseMemoryAction.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/EraseMemoryAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.gui.actions; @@ -9,7 +9,7 @@ import java.awt.event.ActionEvent; import java.util.Objects; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class EraseMemoryAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/plugins/memory/bytemem/gui/edit-clear.png"; diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/FindSequenceAction.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/FindSequenceAction.java index 01174b3cc..6e7d7d624 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/FindSequenceAction.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/FindSequenceAction.java @@ -1,8 +1,8 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.gui.actions; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import net.emustudio.plugins.memory.bytemem.gui.FindSequenceDialog; import net.emustudio.plugins.memory.bytemem.gui.table.MemoryTableModel; @@ -15,7 +15,7 @@ import java.util.function.Consumer; import java.util.function.Supplier; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class FindSequenceAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/plugins/memory/bytemem/gui/edit-find.png"; diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/GotoAddressAction.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/GotoAddressAction.java index 181f6bdd0..713e5f25a 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/GotoAddressAction.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/GotoAddressAction.java @@ -1,8 +1,8 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.gui.actions; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import net.emustudio.plugins.memory.bytemem.api.ByteMemoryContext; import javax.swing.*; @@ -12,7 +12,7 @@ import java.util.Objects; import java.util.function.Consumer; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class GotoAddressAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/plugins/memory/bytemem/gui/format-indent-more.png"; diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/LoadImageAction.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/LoadImageAction.java index 65651d046..fbbca45b3 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/LoadImageAction.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/LoadImageAction.java @@ -1,8 +1,8 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.gui.actions; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import net.emustudio.plugins.memory.bytemem.api.ByteMemoryContext; import net.emustudio.plugins.memory.bytemem.gui.SelectBankAddressDialog; import net.emustudio.plugins.memory.bytemem.loaders.Loader; @@ -16,7 +16,7 @@ import java.util.Objects; import java.util.Optional; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; import static net.emustudio.plugins.memory.bytemem.gui.Constants.IMAGE_EXTENSION_FILTER; public class LoadImageAction extends AbstractAction { diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/SettingsAction.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/SettingsAction.java index 9913b8be0..3201720ae 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/SettingsAction.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/SettingsAction.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.gui.actions; -import net.emustudio.emulib.runtime.interaction.Dialogs; import net.emustudio.emulib.runtime.settings.PluginSettings; +import net.emustudio.emulib.runtime.ui.Dialogs; import net.emustudio.plugins.memory.bytemem.MemoryContextImpl; import net.emustudio.plugins.memory.bytemem.MemoryImpl; import net.emustudio.plugins.memory.bytemem.gui.SettingsDialog; @@ -13,7 +13,7 @@ import java.awt.event.ActionEvent; import java.util.Objects; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class SettingsAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/plugins/memory/bytemem/gui/preferences-system.png"; diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/find_sequence/PerformFindSequenceAction.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/find_sequence/PerformFindSequenceAction.java index ccadee518..300b3ac34 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/find_sequence/PerformFindSequenceAction.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/actions/find_sequence/PerformFindSequenceAction.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.gui.actions.find_sequence; import net.emustudio.emulib.runtime.helpers.RadixUtils; -import net.emustudio.emulib.runtime.interaction.Dialogs; +import net.emustudio.emulib.runtime.ui.Dialogs; import net.emustudio.plugins.memory.bytemem.gui.table.MemoryTableModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/model/FileImagesModel.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/model/FileImagesModel.java index 99e8b015e..3ef1a03bc 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/model/FileImagesModel.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/model/FileImagesModel.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.gui.model; -import net.emustudio.emulib.runtime.interaction.Dialogs; import net.emustudio.emulib.runtime.settings.PluginSettings; +import net.emustudio.emulib.runtime.ui.Dialogs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -83,11 +83,6 @@ public Class getColumnClass(int col) { } } - @Override - public boolean isCellEditable(int row, int col) { - return false; - } - @Override public Object getValueAt(int rowIndex, int columnIndex) { switch (columnIndex) { diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/model/ROMmodel.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/model/ROMmodel.java index 5f5582b2e..d0efcb63c 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/model/ROMmodel.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/model/ROMmodel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.gui.model; diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/table/MemoryCellEditor.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/table/MemoryCellEditor.java index c0846d20c..6d25f3cc9 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/table/MemoryCellEditor.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/table/MemoryCellEditor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.gui.table; diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/table/MemoryCellRenderer.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/table/MemoryCellRenderer.java index 2b3a47459..4868f926e 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/table/MemoryCellRenderer.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/table/MemoryCellRenderer.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.gui.table; @@ -10,8 +10,7 @@ import java.awt.*; import java.util.Objects; -import net.emustudio.emulib.runtime.interaction.GuiConstants; - +import static net.emustudio.emulib.runtime.ui.Constants.FONT_MONOSPACED; import static net.emustudio.plugins.memory.bytemem.gui.Constants.BANK_COLOR; import static net.emustudio.plugins.memory.bytemem.gui.Constants.ROM_COLOR; @@ -30,7 +29,7 @@ class MemoryCellRenderer extends JLabel implements TableCellRenderer { setOpaque(true); setDoubleBuffered(true); setBorder(BorderFactory.createEmptyBorder()); - setFont(GuiConstants.FONT_MONOSPACED); + setFont(FONT_MONOSPACED); setHorizontalAlignment(CENTER); this.selectedBackground = UIManager.getColor("Table.selectionBackground"); diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/table/MemoryRowHeaderRenderer.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/table/MemoryRowHeaderRenderer.java index 4d374c5ec..c0bcb6bcc 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/table/MemoryRowHeaderRenderer.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/table/MemoryRowHeaderRenderer.java @@ -1,13 +1,14 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.gui.table; -import net.emustudio.emulib.runtime.interaction.GuiConstants; import javax.swing.*; import javax.swing.table.JTableHeader; import java.awt.*; +import static net.emustudio.emulib.runtime.ui.Constants.FONT_MONOSPACED; + class MemoryRowHeaderRenderer extends JLabel implements ListCellRenderer { @@ -16,7 +17,7 @@ class MemoryRowHeaderRenderer extends JLabel implements ListCellRenderer setHorizontalAlignment(CENTER); setForeground(header.getForeground()); setBackground(header.getBackground()); - setFont(GuiConstants.FONT_MONOSPACED); + setFont(FONT_MONOSPACED); setOpaque(true); setDoubleBuffered(true); this.setPreferredSize(new Dimension(4 * 18, header.getPreferredSize().height + 3)); diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/table/MemoryTable.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/table/MemoryTable.java index 141a751d9..40d3fb846 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/table/MemoryTable.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/table/MemoryTable.java @@ -1,13 +1,13 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.gui.table; -import net.emustudio.emulib.runtime.interaction.GuiConstants; - import javax.swing.*; import javax.swing.table.TableColumn; import java.util.Objects; +import static net.emustudio.emulib.runtime.ui.Constants.FONT_MONOSPACED; + public class MemoryTable extends JTable { private final MemoryTableModel tableModel; @@ -16,11 +16,11 @@ public MemoryTable(MemoryTableModel tableModel, JScrollPane pm) { this.tableModel = Objects.requireNonNull(tableModel); setModel(this.tableModel); - setFont(GuiConstants.FONT_MONOSPACED); + setFont(FONT_MONOSPACED); setCellSelectionEnabled(true); setFocusCycleRoot(true); setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - getTableHeader().setFont(GuiConstants.FONT_MONOSPACED); + getTableHeader().setFont(FONT_MONOSPACED); setDefaultRenderer(Object.class, new MemoryCellRenderer(getTableHeader(), tableModel, pm, getRowHeight())); setOpaque(true); diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/table/MemoryTableModel.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/table/MemoryTableModel.java index 4c52821a8..b4fa9387e 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/table/MemoryTableModel.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/table/MemoryTableModel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.gui.table; diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/loaders/BinaryLoader.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/loaders/BinaryLoader.java index 96a3df956..ec54c112c 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/loaders/BinaryLoader.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/loaders/BinaryLoader.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.loaders; diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/loaders/HexLoader.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/loaders/HexLoader.java index 039648a25..4cb1beebd 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/loaders/HexLoader.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/loaders/HexLoader.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.loaders; diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/loaders/Loader.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/loaders/Loader.java index 3c105a0a9..6cb12ffde 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/loaders/Loader.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/loaders/Loader.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.loaders; diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/loaders/TapLoader.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/loaders/TapLoader.java index f62cd02cc..8ddaa0876 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/loaders/TapLoader.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/loaders/TapLoader.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.loaders; diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/loaders/TzxLoader.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/loaders/TzxLoader.java index f1b8949c6..0fb895d88 100644 --- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/loaders/TzxLoader.java +++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/loaders/TzxLoader.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem.loaders; diff --git a/plugins/memory/byte-mem/src/test/java/net/emustudio/plugins/memory/bytemem/MemoryImplTest.java b/plugins/memory/byte-mem/src/test/java/net/emustudio/plugins/memory/bytemem/MemoryImplTest.java index 797a31ab9..54ba78d18 100644 --- a/plugins/memory/byte-mem/src/test/java/net/emustudio/plugins/memory/bytemem/MemoryImplTest.java +++ b/plugins/memory/byte-mem/src/test/java/net/emustudio/plugins/memory/bytemem/MemoryImplTest.java @@ -1,11 +1,11 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem; import net.emustudio.emulib.runtime.ApplicationApi; import net.emustudio.emulib.runtime.ContextPool; -import net.emustudio.emulib.runtime.interaction.Dialogs; import net.emustudio.emulib.runtime.settings.PluginSettings; +import net.emustudio.emulib.runtime.ui.Dialogs; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/plugins/memory/byte-mem/src/test/java/net/emustudio/plugins/memory/bytemem/RangeTreeTest.java b/plugins/memory/byte-mem/src/test/java/net/emustudio/plugins/memory/bytemem/RangeTreeTest.java index 5faee0dc8..b182165a8 100644 --- a/plugins/memory/byte-mem/src/test/java/net/emustudio/plugins/memory/bytemem/RangeTreeTest.java +++ b/plugins/memory/byte-mem/src/test/java/net/emustudio/plugins/memory/bytemem/RangeTreeTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.bytemem; diff --git a/plugins/memory/ram-mem/build.gradle b/plugins/memory/ram-mem/build.gradle index 752fe8b55..d90b260c8 100644 --- a/plugins/memory/ram-mem/build.gradle +++ b/plugins/memory/ram-mem/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens diff --git a/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/MemoryContextImpl.java b/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/MemoryContextImpl.java index 352c17251..dea493284 100644 --- a/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/MemoryContextImpl.java +++ b/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/MemoryContextImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ram; diff --git a/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/MemoryImpl.java b/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/MemoryImpl.java index ec2048b3d..a67c71d05 100644 --- a/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/MemoryImpl.java +++ b/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/MemoryImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ram; diff --git a/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/api/RamInstruction.java b/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/api/RamInstruction.java index f04a87b39..b6af0ca7a 100644 --- a/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/api/RamInstruction.java +++ b/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/api/RamInstruction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ram.api; diff --git a/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/api/RamLabel.java b/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/api/RamLabel.java index 181cf347d..3959fa02c 100644 --- a/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/api/RamLabel.java +++ b/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/api/RamLabel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ram.api; diff --git a/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/api/RamMemoryContext.java b/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/api/RamMemoryContext.java index e53165b79..7cdd153bc 100644 --- a/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/api/RamMemoryContext.java +++ b/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/api/RamMemoryContext.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ram.api; diff --git a/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/api/RamValue.java b/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/api/RamValue.java index 4d7d2b415..f31c03f56 100644 --- a/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/api/RamValue.java +++ b/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/api/RamValue.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ram.api; diff --git a/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/gui/MemoryGui.java b/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/gui/MemoryGui.java index 6868d7acd..cce516e19 100644 --- a/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/gui/MemoryGui.java +++ b/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/gui/MemoryGui.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ram.gui; -import net.emustudio.emulib.runtime.interaction.Dialogs; -import net.emustudio.emulib.runtime.interaction.ToolbarButton; +import net.emustudio.emulib.runtime.ui.Dialogs; +import net.emustudio.emulib.runtime.ui.GUI; import net.emustudio.plugins.memory.ram.MemoryContextImpl; import net.emustudio.plugins.memory.ram.gui.actions.DumpMemoryAction; import net.emustudio.plugins.memory.ram.gui.actions.EraseMemoryAction; @@ -11,10 +11,11 @@ import javax.swing.*; import javax.swing.border.TitledBorder; + import java.awt.event.KeyEvent; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.FONT_COMMON; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.FONT_MONOSPACED; +import static net.emustudio.emulib.runtime.ui.Constants.FONT_COMMON; +import static net.emustudio.emulib.runtime.ui.Constants.FONT_MONOSPACED; public class MemoryGui extends JDialog { private final JTable table; @@ -24,7 +25,7 @@ public class MemoryGui extends JDialog { private final EraseMemoryAction eraseMemoryAction; public MemoryGui(JFrame parent, MemoryContextImpl memory, Dialogs dialogs) { - super(parent, false); + super(parent, "Program memory", false); RamTableModel tableModel = new RamTableModel(memory); this.table = new JTable(tableModel); @@ -42,26 +43,21 @@ public MemoryGui(JFrame parent, MemoryContextImpl memory, Dialogs dialogs) { } private void initComponents() { - JToolBar toolBar = new JToolBar(); + JToolBar toolBar = GUI.toolBar(); JPanel jPanel1 = new JPanel(); - JScrollPane jScrollPane1 = new JScrollPane(); setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); getRootPane().registerKeyboardAction(e -> dispose(), KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_IN_FOCUSED_WINDOW); - setTitle("Program memory"); - - toolBar.setFloatable(false); - toolBar.setRollover(true); - toolBar.add(new ToolbarButton(loadImageAction)); - toolBar.add(new ToolbarButton(dumpMemoryAction)); + toolBar.add(GUI.toolbarButton(loadImageAction)); + toolBar.add(GUI.toolbarButton(dumpMemoryAction)); toolBar.addSeparator(); - toolBar.add(new ToolbarButton(eraseMemoryAction)); + toolBar.add(GUI.toolbarButton(eraseMemoryAction)); jPanel1.setBorder(BorderFactory.createTitledBorder(null, "Tape content", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, FONT_COMMON)); table.setGridColor(java.awt.SystemColor.control); - jScrollPane1.setViewportView(table); + JScrollPane jScrollPane1 = GUI.scrollPane(table); GroupLayout jPanel1Layout = new GroupLayout(jPanel1); jPanel1.setLayout(jPanel1Layout); diff --git a/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/gui/RamTableModel.java b/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/gui/RamTableModel.java index 8f3edffd2..350afc3f4 100644 --- a/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/gui/RamTableModel.java +++ b/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/gui/RamTableModel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ram.gui; diff --git a/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/gui/actions/DumpMemoryAction.java b/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/gui/actions/DumpMemoryAction.java index 094617c3a..4986edf46 100644 --- a/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/gui/actions/DumpMemoryAction.java +++ b/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/gui/actions/DumpMemoryAction.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ram.gui.actions; -import net.emustudio.emulib.runtime.interaction.Dialogs; -import net.emustudio.emulib.runtime.interaction.FileExtensionsFilter; +import net.emustudio.emulib.runtime.ui.Dialogs; +import net.emustudio.emulib.runtime.ui.components.FileExtensionsFilter; import net.emustudio.plugins.memory.ram.MemoryContextImpl; import net.emustudio.plugins.memory.ram.api.RamMemoryContext; import org.slf4j.Logger; @@ -21,7 +21,7 @@ import java.util.Objects; import java.util.Optional; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class DumpMemoryAction extends AbstractAction { private final static Logger LOGGER = LoggerFactory.getLogger(DumpMemoryAction.class); diff --git a/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/gui/actions/EraseMemoryAction.java b/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/gui/actions/EraseMemoryAction.java index ecaea0d1d..f7f632d4a 100644 --- a/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/gui/actions/EraseMemoryAction.java +++ b/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/gui/actions/EraseMemoryAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ram.gui.actions; @@ -9,7 +9,7 @@ import java.awt.event.ActionEvent; import java.util.Objects; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class EraseMemoryAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/plugins/memory/ram/gui/clear.png"; diff --git a/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/gui/actions/LoadImageAction.java b/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/gui/actions/LoadImageAction.java index 4b49e4955..c44266f8c 100644 --- a/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/gui/actions/LoadImageAction.java +++ b/plugins/memory/ram-mem/src/main/java/net/emustudio/plugins/memory/ram/gui/actions/LoadImageAction.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ram.gui.actions; -import net.emustudio.emulib.runtime.interaction.Dialogs; -import net.emustudio.emulib.runtime.interaction.FileExtensionsFilter; +import net.emustudio.emulib.runtime.ui.Dialogs; +import net.emustudio.emulib.runtime.ui.components.FileExtensionsFilter; import net.emustudio.plugins.memory.ram.MemoryContextImpl; import javax.swing.*; @@ -15,7 +15,7 @@ import java.util.Objects; import java.util.Optional; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class LoadImageAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/plugins/memory/ram/gui/document-open.png"; diff --git a/plugins/memory/ram-mem/src/test/java/net/emustudio/plugins/memory/ram/MemoryContextImplTest.java b/plugins/memory/ram-mem/src/test/java/net/emustudio/plugins/memory/ram/MemoryContextImplTest.java index 639d3b638..1c7e6a1d1 100644 --- a/plugins/memory/ram-mem/src/test/java/net/emustudio/plugins/memory/ram/MemoryContextImplTest.java +++ b/plugins/memory/ram-mem/src/test/java/net/emustudio/plugins/memory/ram/MemoryContextImplTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ram; diff --git a/plugins/memory/ram-mem/src/test/java/net/emustudio/plugins/memory/ram/MemoryImplTest.java b/plugins/memory/ram-mem/src/test/java/net/emustudio/plugins/memory/ram/MemoryImplTest.java index 0dc225dc2..5aa850815 100644 --- a/plugins/memory/ram-mem/src/test/java/net/emustudio/plugins/memory/ram/MemoryImplTest.java +++ b/plugins/memory/ram-mem/src/test/java/net/emustudio/plugins/memory/ram/MemoryImplTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ram; diff --git a/plugins/memory/rasp-mem/build.gradle b/plugins/memory/rasp-mem/build.gradle index 752fe8b55..d90b260c8 100644 --- a/plugins/memory/rasp-mem/build.gradle +++ b/plugins/memory/rasp-mem/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens diff --git a/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/MemoryContextImpl.java b/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/MemoryContextImpl.java index aca8ff259..7657abd0b 100644 --- a/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/MemoryContextImpl.java +++ b/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/MemoryContextImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.rasp; diff --git a/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/MemoryImpl.java b/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/MemoryImpl.java index efb13eaa0..fbb552192 100644 --- a/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/MemoryImpl.java +++ b/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/MemoryImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.rasp; diff --git a/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/api/RaspLabel.java b/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/api/RaspLabel.java index fb41d3ac4..ddbe6f2e8 100644 --- a/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/api/RaspLabel.java +++ b/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/api/RaspLabel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.rasp.api; diff --git a/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/api/RaspMemoryContext.java b/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/api/RaspMemoryContext.java index b12c31dd5..069430ce0 100644 --- a/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/api/RaspMemoryContext.java +++ b/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/api/RaspMemoryContext.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.rasp.api; diff --git a/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/gui/Disassembler.java b/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/gui/Disassembler.java index 031e441ba..8cb0223a1 100644 --- a/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/gui/Disassembler.java +++ b/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/gui/Disassembler.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.rasp.gui; diff --git a/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/gui/MemoryGui.java b/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/gui/MemoryGui.java index 178932ba2..0de64728b 100644 --- a/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/gui/MemoryGui.java +++ b/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/gui/MemoryGui.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.rasp.gui; import net.emustudio.emulib.runtime.ApplicationApi; -import net.emustudio.emulib.runtime.interaction.ToolbarButton; +import net.emustudio.emulib.runtime.ui.GUI; import net.emustudio.plugins.memory.rasp.MemoryContextImpl; import net.emustudio.plugins.memory.rasp.gui.actions.DumpMemoryAction; import net.emustudio.plugins.memory.rasp.gui.actions.EraseMemoryAction; @@ -13,7 +13,7 @@ import java.awt.event.KeyEvent; import java.util.Objects; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.FONT_MONOSPACED; +import static net.emustudio.emulib.runtime.ui.Constants.FONT_MONOSPACED; public class MemoryGui extends JDialog { private final JTable table; @@ -63,10 +63,10 @@ public void mouseClicked(java.awt.event.MouseEvent evt) { toolBar.setFloatable(false); toolBar.setRollover(true); - toolBar.add(new ToolbarButton(loadImageAction)); - toolBar.add(new ToolbarButton(dumpMemoryAction)); + toolBar.add(GUI.toolbarButton(loadImageAction)); + toolBar.add(GUI.toolbarButton(dumpMemoryAction)); toolBar.addSeparator(); - toolBar.add(new ToolbarButton(eraseMemoryAction)); + toolBar.add(GUI.toolbarButton(eraseMemoryAction)); GroupLayout layout = new GroupLayout(getContentPane()); getContentPane().setLayout(layout); diff --git a/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/gui/RaspTableModel.java b/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/gui/RaspTableModel.java index fd0df639b..92456ecba 100644 --- a/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/gui/RaspTableModel.java +++ b/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/gui/RaspTableModel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.rasp.gui; diff --git a/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/gui/actions/DumpMemoryAction.java b/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/gui/actions/DumpMemoryAction.java index f140b2836..780adb370 100644 --- a/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/gui/actions/DumpMemoryAction.java +++ b/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/gui/actions/DumpMemoryAction.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.rasp.gui.actions; -import net.emustudio.emulib.runtime.interaction.Dialogs; -import net.emustudio.emulib.runtime.interaction.FileExtensionsFilter; +import net.emustudio.emulib.runtime.ui.Dialogs; +import net.emustudio.emulib.runtime.ui.components.FileExtensionsFilter; import net.emustudio.plugins.memory.rasp.MemoryContextImpl; import net.emustudio.plugins.memory.rasp.api.RaspMemoryContext; import org.slf4j.Logger; @@ -22,7 +22,7 @@ import java.util.Optional; import java.util.function.Supplier; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class DumpMemoryAction extends AbstractAction { private final static Logger LOGGER = LoggerFactory.getLogger(DumpMemoryAction.class); diff --git a/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/gui/actions/EraseMemoryAction.java b/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/gui/actions/EraseMemoryAction.java index 867d385f2..be4c419eb 100644 --- a/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/gui/actions/EraseMemoryAction.java +++ b/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/gui/actions/EraseMemoryAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.rasp.gui.actions; @@ -9,7 +9,7 @@ import java.awt.event.ActionEvent; import java.util.Objects; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class EraseMemoryAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/plugins/memory/rasp/gui/clear.png"; diff --git a/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/gui/actions/LoadImageAction.java b/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/gui/actions/LoadImageAction.java index a9e1bcc7f..dfdfc913c 100644 --- a/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/gui/actions/LoadImageAction.java +++ b/plugins/memory/rasp-mem/src/main/java/net/emustudio/plugins/memory/rasp/gui/actions/LoadImageAction.java @@ -1,9 +1,9 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.rasp.gui.actions; -import net.emustudio.emulib.runtime.interaction.Dialogs; -import net.emustudio.emulib.runtime.interaction.FileExtensionsFilter; +import net.emustudio.emulib.runtime.ui.Dialogs; +import net.emustudio.emulib.runtime.ui.components.FileExtensionsFilter; import net.emustudio.plugins.memory.rasp.MemoryContextImpl; import javax.swing.*; @@ -16,7 +16,8 @@ import java.util.Optional; import java.util.function.Consumer; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; + public class LoadImageAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/plugins/memory/rasp/gui/document-open.png"; diff --git a/plugins/memory/rasp-mem/src/test/java/net/emustudio/plugins/memory/rasp/MemoryImplTest.java b/plugins/memory/rasp-mem/src/test/java/net/emustudio/plugins/memory/rasp/MemoryImplTest.java index 7a67f9539..dfb8094c1 100644 --- a/plugins/memory/rasp-mem/src/test/java/net/emustudio/plugins/memory/rasp/MemoryImplTest.java +++ b/plugins/memory/rasp-mem/src/test/java/net/emustudio/plugins/memory/rasp/MemoryImplTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.rasp; diff --git a/plugins/memory/ssem-mem/build.gradle b/plugins/memory/ssem-mem/build.gradle index 50ecba6e3..a94030479 100644 --- a/plugins/memory/ssem-mem/build.gradle +++ b/plugins/memory/ssem-mem/build.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ import org.apache.tools.ant.filters.ReplaceTokens diff --git a/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/MemoryContextImpl.java b/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/MemoryContextImpl.java index 0ce0d9980..93f018dd3 100644 --- a/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/MemoryContextImpl.java +++ b/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/MemoryContextImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ssem; diff --git a/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/MemoryImpl.java b/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/MemoryImpl.java index 3230c343b..ea17b23b8 100644 --- a/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/MemoryImpl.java +++ b/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/MemoryImpl.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ssem; diff --git a/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/Constants.java b/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/Constants.java index 2c67331c4..c4fb3ef23 100644 --- a/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/Constants.java +++ b/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/Constants.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ssem.gui; diff --git a/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/MemoryGui.java b/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/MemoryGui.java index 383354192..7fb87cbc9 100644 --- a/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/MemoryGui.java +++ b/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/MemoryGui.java @@ -1,10 +1,10 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ssem.gui; import net.emustudio.emulib.plugins.memory.MemoryContext; import net.emustudio.emulib.runtime.ApplicationApi; -import net.emustudio.emulib.runtime.interaction.ToolbarButton; +import net.emustudio.emulib.runtime.ui.GUI; import net.emustudio.plugins.memory.ssem.gui.actions.DumpMemoryAction; import net.emustudio.plugins.memory.ssem.gui.actions.EraseMemoryAction; import net.emustudio.plugins.memory.ssem.gui.actions.LoadImageAction; @@ -52,10 +52,10 @@ private void initComponents() { toolBar.setFloatable(false); toolBar.setRollover(true); - toolBar.add(new ToolbarButton(loadImageAction)); - toolBar.add(new ToolbarButton(dumpMemoryAction)); + toolBar.add(GUI.toolbarButton(loadImageAction)); + toolBar.add(GUI.toolbarButton(dumpMemoryAction)); toolBar.addSeparator(); - toolBar.add(new ToolbarButton(eraseMemoryAction)); + toolBar.add(GUI.toolbarButton(eraseMemoryAction)); GroupLayout layout = new GroupLayout(getContentPane()); getContentPane().setLayout(layout); diff --git a/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/actions/DumpMemoryAction.java b/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/actions/DumpMemoryAction.java index f5d81222e..a4da7ed2b 100644 --- a/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/actions/DumpMemoryAction.java +++ b/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/actions/DumpMemoryAction.java @@ -1,11 +1,11 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ssem.gui.actions; import net.emustudio.emulib.plugins.memory.MemoryContext; import net.emustudio.emulib.runtime.ApplicationApi; -import net.emustudio.emulib.runtime.interaction.Dialogs; -import net.emustudio.emulib.runtime.interaction.FileExtensionsFilter; +import net.emustudio.emulib.runtime.ui.Dialogs; +import net.emustudio.emulib.runtime.ui.components.FileExtensionsFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Optional; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class DumpMemoryAction extends AbstractAction { private final static Logger LOGGER = LoggerFactory.getLogger(DumpMemoryAction.class); diff --git a/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/actions/EraseMemoryAction.java b/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/actions/EraseMemoryAction.java index 061e99e7e..9f56aefe7 100644 --- a/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/actions/EraseMemoryAction.java +++ b/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/actions/EraseMemoryAction.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ssem.gui.actions; @@ -9,7 +9,7 @@ import java.awt.event.ActionEvent; import java.util.Objects; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class EraseMemoryAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/plugins/memory/ssem/gui/clear.png"; diff --git a/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/actions/LoadImageAction.java b/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/actions/LoadImageAction.java index 8844be0d8..dea0a79d4 100644 --- a/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/actions/LoadImageAction.java +++ b/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/actions/LoadImageAction.java @@ -1,12 +1,12 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ssem.gui.actions; import net.emustudio.emulib.plugins.memory.MemoryContext; import net.emustudio.emulib.runtime.ApplicationApi; import net.emustudio.emulib.runtime.helpers.NumberUtils; -import net.emustudio.emulib.runtime.interaction.Dialogs; -import net.emustudio.emulib.runtime.interaction.FileExtensionsFilter; +import net.emustudio.emulib.runtime.ui.Dialogs; +import net.emustudio.emulib.runtime.ui.components.FileExtensionsFilter; import javax.swing.*; import java.awt.event.ActionEvent; @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Optional; -import static net.emustudio.emulib.runtime.interaction.GuiUtils.loadIcon; +import static net.emustudio.emulib.runtime.ui.GUI.loadIcon; public class LoadImageAction extends AbstractAction { private final static String ICON_FILE = "/net/emustudio/plugins/memory/ssem/gui/document-open.png"; diff --git a/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/table/MemoryCellEditor.java b/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/table/MemoryCellEditor.java index ef0a5e9bd..351ee9741 100644 --- a/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/table/MemoryCellEditor.java +++ b/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/table/MemoryCellEditor.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ssem.gui.table; diff --git a/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/table/MemoryCellRenderer.java b/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/table/MemoryCellRenderer.java index da1060232..b03b79dad 100644 --- a/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/table/MemoryCellRenderer.java +++ b/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/table/MemoryCellRenderer.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ssem.gui.table; @@ -7,8 +7,8 @@ import javax.swing.table.TableCellRenderer; import java.awt.*; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.FONT_MONOSPACED; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.FONT_MONOSPACED_BOLD; +import static net.emustudio.emulib.runtime.ui.Constants.FONT_MONOSPACED; +import static net.emustudio.emulib.runtime.ui.Constants.FONT_MONOSPACED_BOLD; class MemoryCellRenderer extends JLabel implements TableCellRenderer { private final static Color COLOR_FORE = Color.BLACK; diff --git a/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/table/MemoryRowHeaderRenderer.java b/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/table/MemoryRowHeaderRenderer.java index 34f49eb23..a0fc07463 100644 --- a/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/table/MemoryRowHeaderRenderer.java +++ b/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/table/MemoryRowHeaderRenderer.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ssem.gui.table; @@ -8,7 +8,7 @@ import javax.swing.table.JTableHeader; import java.awt.*; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.FONT_MONOSPACED; +import static net.emustudio.emulib.runtime.ui.Constants.FONT_MONOSPACED; class MemoryRowHeaderRenderer extends JLabel implements ListCellRenderer { diff --git a/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/table/MemoryTable.java b/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/table/MemoryTable.java index 7e38b5b7e..16a637273 100644 --- a/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/table/MemoryTable.java +++ b/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/table/MemoryTable.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ssem.gui.table; @@ -7,7 +7,7 @@ import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; -import static net.emustudio.emulib.runtime.interaction.GuiConstants.FONT_MONOSPACED; +import static net.emustudio.emulib.runtime.ui.Constants.FONT_MONOSPACED; import static net.emustudio.plugins.memory.ssem.gui.Constants.COLUMN_WIDTH; public class MemoryTable extends JTable { diff --git a/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/table/MemoryTableModel.java b/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/table/MemoryTableModel.java index 0daf32cae..b30849ae0 100644 --- a/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/table/MemoryTableModel.java +++ b/plugins/memory/ssem-mem/src/main/java/net/emustudio/plugins/memory/ssem/gui/table/MemoryTableModel.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ssem.gui.table; diff --git a/plugins/memory/ssem-mem/src/test/java/net/emustudio/plugins/memory/ssem/MemoryContextImplTest.java b/plugins/memory/ssem-mem/src/test/java/net/emustudio/plugins/memory/ssem/MemoryContextImplTest.java index a4462a29a..7fe166aad 100644 --- a/plugins/memory/ssem-mem/src/test/java/net/emustudio/plugins/memory/ssem/MemoryContextImplTest.java +++ b/plugins/memory/ssem-mem/src/test/java/net/emustudio/plugins/memory/ssem/MemoryContextImplTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ssem; diff --git a/plugins/memory/ssem-mem/src/test/java/net/emustudio/plugins/memory/ssem/MemoryImplTest.java b/plugins/memory/ssem-mem/src/test/java/net/emustudio/plugins/memory/ssem/MemoryImplTest.java index 3b35b110a..956cbc096 100644 --- a/plugins/memory/ssem-mem/src/test/java/net/emustudio/plugins/memory/ssem/MemoryImplTest.java +++ b/plugins/memory/ssem-mem/src/test/java/net/emustudio/plugins/memory/ssem/MemoryImplTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ssem; diff --git a/plugins/memory/ssem-mem/src/test/java/net/emustudio/plugins/memory/ssem/gui/MemoryTableModelTest.java b/plugins/memory/ssem-mem/src/test/java/net/emustudio/plugins/memory/ssem/gui/MemoryTableModelTest.java index 8dc1971de..4516f1b13 100644 --- a/plugins/memory/ssem-mem/src/test/java/net/emustudio/plugins/memory/ssem/gui/MemoryTableModelTest.java +++ b/plugins/memory/ssem-mem/src/test/java/net/emustudio/plugins/memory/ssem/gui/MemoryTableModelTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ssem.gui; diff --git a/plugins/memory/ssem-mem/src/test/java/net/emustudio/plugins/memory/ssem/gui/actions/DumpMemoryActionTest.java b/plugins/memory/ssem-mem/src/test/java/net/emustudio/plugins/memory/ssem/gui/actions/DumpMemoryActionTest.java index 630d993f9..798dd9e4f 100644 --- a/plugins/memory/ssem-mem/src/test/java/net/emustudio/plugins/memory/ssem/gui/actions/DumpMemoryActionTest.java +++ b/plugins/memory/ssem-mem/src/test/java/net/emustudio/plugins/memory/ssem/gui/actions/DumpMemoryActionTest.java @@ -1,12 +1,12 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ssem.gui.actions; import net.emustudio.emulib.plugins.memory.MemoryContext; import net.emustudio.emulib.plugins.memory.annotations.Annotations; import net.emustudio.emulib.runtime.ApplicationApi; -import net.emustudio.emulib.runtime.interaction.Dialogs; -import net.emustudio.emulib.runtime.interaction.FileExtensionsFilter; +import net.emustudio.emulib.runtime.ui.Dialogs; +import net.emustudio.emulib.runtime.ui.components.FileExtensionsFilter; import net.emustudio.plugins.memory.ssem.MemoryContextImpl; import org.junit.Rule; import org.junit.Test; diff --git a/plugins/memory/ssem-mem/src/test/java/net/emustudio/plugins/memory/ssem/gui/actions/EraseMemoryActionTest.java b/plugins/memory/ssem-mem/src/test/java/net/emustudio/plugins/memory/ssem/gui/actions/EraseMemoryActionTest.java index ea90cf055..c720c3ae0 100644 --- a/plugins/memory/ssem-mem/src/test/java/net/emustudio/plugins/memory/ssem/gui/actions/EraseMemoryActionTest.java +++ b/plugins/memory/ssem-mem/src/test/java/net/emustudio/plugins/memory/ssem/gui/actions/EraseMemoryActionTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ssem.gui.actions; diff --git a/plugins/memory/ssem-mem/src/test/java/net/emustudio/plugins/memory/ssem/gui/actions/LoadImageActionTest.java b/plugins/memory/ssem-mem/src/test/java/net/emustudio/plugins/memory/ssem/gui/actions/LoadImageActionTest.java index 8a5274f9c..c672bcfc5 100644 --- a/plugins/memory/ssem-mem/src/test/java/net/emustudio/plugins/memory/ssem/gui/actions/LoadImageActionTest.java +++ b/plugins/memory/ssem-mem/src/test/java/net/emustudio/plugins/memory/ssem/gui/actions/LoadImageActionTest.java @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ package net.emustudio.plugins.memory.ssem.gui.actions; diff --git a/settings.gradle b/settings.gradle index 94ede2c02..b52262725 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,8 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ pluginManagement { repositories { + mavenLocal() mavenCentral() gradlePluginPortal() } diff --git a/test_report.gradle b/test_report.gradle index f006becf9..0c3b39c45 100644 --- a/test_report.gradle +++ b/test_report.gradle @@ -1,4 +1,4 @@ -/* SPDX-FileCopyrightText: 2006-2025 Peter Jakubčo +/* SPDX-FileCopyrightText: 2006-2026 Peter Jakubčo SPDX-License-Identifier: GPL-3.0-or-later */ // Credits go to: https://gist.github.com/lwasyl/f5b2b4ebe9e348ebbd8ee4cb995f8362#file-gradle_tests_report-gradle // https://medium.com/@wasyl/pretty-tests-summary-in-gradle-744804dd676c