diff --git a/java/src/jmri/jmrix/sprog/SprogActionListBundle.properties b/java/src/jmri/jmrix/sprog/SprogActionListBundle.properties new file mode 100644 index 00000000000..d91656fc182 --- /dev/null +++ b/java/src/jmri/jmrix/sprog/SprogActionListBundle.properties @@ -0,0 +1,6 @@ +# SprogActionListBundle.properties +# +# Properties listing names for "Action" classes that can appear +# in various forms in advanced SPROG preferences + +jmri.jmrix.sprog.sprogslotmon.SprogSlotMonAction = Open SPROG Slot Monitor diff --git a/java/src/jmri/jmrix/sprog/SprogBundle.properties b/java/src/jmri/jmrix/sprog/SprogBundle.properties index 43da4329ea4..2f4625caf62 100644 --- a/java/src/jmri/jmrix/sprog/SprogBundle.properties +++ b/java/src/jmri/jmrix/sprog/SprogBundle.properties @@ -106,6 +106,3 @@ SprogSimOption = Operate as # SprogTurnout (Add to table pane) item (no inputs) AddOutputEntryToolTip = enter a number from 1 to 2044 (inclusive). - -# Startup actions -StartSlotMonAction = Start SPROG Slot Monitor diff --git a/java/src/jmri/jmrix/sprog/SprogSystemConnectionMemo.java b/java/src/jmri/jmrix/sprog/SprogSystemConnectionMemo.java index e50ffa38453..c0eeb380030 100644 --- a/java/src/jmri/jmrix/sprog/SprogSystemConnectionMemo.java +++ b/java/src/jmri/jmrix/sprog/SprogSystemConnectionMemo.java @@ -267,8 +267,7 @@ public TurnoutManager getTurnoutManager() { @Override protected ResourceBundle getActionModelResourceBundle() { - //No actions that can be loaded at startup - return null; + return ResourceBundle.getBundle("jmri.jmrix.sprog.SprogActionListBundle"); } @Override diff --git a/java/src/jmri/jmrix/sprog/sprogslotmon/SprogSlotMonAction.java b/java/src/jmri/jmrix/sprog/sprogslotmon/SprogSlotMonAction.java index d0f7736455f..16e5a332199 100644 --- a/java/src/jmri/jmrix/sprog/sprogslotmon/SprogSlotMonAction.java +++ b/java/src/jmri/jmrix/sprog/sprogslotmon/SprogSlotMonAction.java @@ -7,9 +7,6 @@ import jmri.InstanceManager; import jmri.jmrix.sprog.SprogSystemConnectionMemo; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * Swing action to create and register a SprogSlotMonFrame object. * @@ -37,20 +34,13 @@ public SprogSlotMonAction() { @Override public void actionPerformed(ActionEvent e) { - if (_memo != null) { - if (_memo.getCommandStation() == null) { + if(_memo.getCommandStation() == null) { // create SlotManager if it doesn't exist _memo.configureCommandStation(_memo.getNumSlots()); } SprogSlotMonFrame f = new SprogSlotMonFrame(_memo); f.setVisible(true); - } else { - log.warn("Trying to start SPROG Slot monitor for incompatible connection type"); } - } - - // initialize logging - private final static Logger log = LoggerFactory.getLogger(SprogSlotMonAction.class); } diff --git a/java/src/jmri/jmrix/sprog/sprogslotmon/SprogSlotMonStartupActionFactory.java b/java/src/jmri/jmrix/sprog/sprogslotmon/SprogSlotMonStartupActionFactory.java deleted file mode 100644 index 4942ae95804..00000000000 --- a/java/src/jmri/jmrix/sprog/sprogslotmon/SprogSlotMonStartupActionFactory.java +++ /dev/null @@ -1,33 +0,0 @@ -package jmri.jmrix.sprog.sprogslotmon; - -import jmri.util.startup.AbstractStartupActionFactory; -import jmri.util.startup.StartupActionFactory; - -import java.util.Locale; - -import org.openide.util.lookup.ServiceProvider; - -/** - * {@link jmri.util.startup.StartupActionFactory} for the - * {@link jmri.jmrix.sprog.sprogslotmon.SprogSlotMonAction}. - * - * @author Andrew Crosland Copyright (C) 2021 - */ -@ServiceProvider(service = StartupActionFactory.class) -public final class SprogSlotMonStartupActionFactory extends AbstractStartupActionFactory { - - @Override - public String getTitle(Class clazz, Locale locale) throws IllegalArgumentException { - if (clazz.equals(SprogSlotMonAction.class)) { - return Bundle.getMessage(locale, "StartSlotMonAction"); // NOI18N - } - throw new IllegalArgumentException(clazz.getName() + " is not supported by " + this.getClass().getName()); - } - - @Override - public Class[] getActionClasses() { - return new Class[]{SprogSlotMonAction.class}; - } - -} - diff --git a/java/test/jmri/jmrix/sprog/sprogslotmon/SprogSlotMonStartupActionFactoryTest.java b/java/test/jmri/jmrix/sprog/sprogslotmon/SprogSlotMonStartupActionFactoryTest.java deleted file mode 100644 index 92a73bc588a..00000000000 --- a/java/test/jmri/jmrix/sprog/sprogslotmon/SprogSlotMonStartupActionFactoryTest.java +++ /dev/null @@ -1,32 +0,0 @@ -package jmri.jmrix.sprog.sprogslotmon; - -import jmri.util.JUnitUtil; - -import org.junit.Assert; -import org.junit.jupiter.api.*; - -/** - * - * @author Andrew Crosland Copyright (C) 2021 - */ -public class SprogSlotMonStartupActionFactoryTest { - - @Test - public void testCTor() { - SprogSlotMonStartupActionFactory t = new SprogSlotMonStartupActionFactory(); - Assert.assertNotNull("exists",t); - } - - @BeforeEach - public void setUp() { - JUnitUtil.setUp(); - } - - @AfterEach - public void tearDown() { - JUnitUtil.tearDown(); - } - - // private final static Logger log = LoggerFactory.getLogger(LnTcpStartupActionFactoryTest.class); - -}