more fixes for #16

Enerccio · Jan 15, 2023 · af61748 · af61748
1 parent aacc82a
commit af61748
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/com/en_circle/slt/plugin/settings/SltSettingsComponent.java b/src/main/java/com/en_circle/slt/plugin/settings/SltSettingsComponent.java
@@ -19,6 +19,8 @@ public SltSettingsComponent() {
         root = FormBuilder.createFormBuilder()
                 .addLabeledComponent(new JBLabel(SltBundle.message("slt.ui.settings.executable")),
                         sbclExecutable, 1, false)
+                .addLabeledComponent(new JBLabel(SltBundle.message("slt.ui.settings.port")),
+                        port, 1, false)
                 .addLabeledComponent(new JBLabel(SltBundle.message("slt.ui.settings.qlpath")),
                         quicklispStartScript, 1, false)
                 .addComponentFillVertically(new JPanel(), 0)

diff --git a/src/main/java/com/en_circle/slt/plugin/settings/SltSettingsConfigurable.java b/src/main/java/com/en_circle/slt/plugin/settings/SltSettingsConfigurable.java
@@ -49,7 +49,7 @@ public boolean isModified() {
     public void apply() throws ConfigurationException {
         SltState settings = SltState.getInstance();
         boolean restartServer = false;
-        if (!settings.sbclExecutable.equals(component.getSbclExecutable())) {
+        if (!component.getSbclExecutable().equals(settings.sbclExecutable)) {
             restartServer = true;
         }
         if (component.getPort() != settings.port) {
@@ -60,6 +60,9 @@ public void apply() throws ConfigurationException {
         }
 
         settings.sbclExecutable = component.getSbclExecutable();
+        settings.port = component.getPort();
+        settings.quicklispStartScript = component.getQuicklispStartScript();
+
         if (restartServer && SwankServer.INSTANCE.isActive()) {
             if (Messages.YES == Messages.showYesNoDialog(
                     SltBundle.message("slt.ui.settings.restart.prompt"),

diff --git a/src/main/resources/messages/SltBundle.properties b/src/main/resources/messages/SltBundle.properties
@@ -73,6 +73,7 @@ slt.ui.debugger.frame.value=Value
 slt.ui.settings.title=SLT Configuration
 slt.ui.settings.executable=SBCL executable:
 slt.ui.settings.qlpath=Quicklisp path:
+slt.ui.settings.port=Swank port:
 slt.ui.settings.restart.prompt=Settings changed, restart server?
 slt.ui.settings.restart.title=Settings Changed
 slt.ui.settings.restart.yes=Yes