M3-21, M3-15: Addressed issues with RS422 connections

mbari-org · Dec 16, 2019 · 90e8939 · 90e8939
1 parent e28d058
commit 90e8939
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/...ri.vars.ui/src/main/java/org/mbari/vars/ui/mediaplayers/vcr/MediaControlsFactoryImpl.java b/...ri.vars.ui/src/main/java/org/mbari/vars/ui/mediaplayers/vcr/MediaControlsFactoryImpl.java
@@ -62,7 +62,7 @@ public class MediaControlsFactoryImpl implements MediaControlsFactory {
         String title = i18n.getString("mediaplayer.vcr.open.error.title");
         String header = i18n.getString("mediaplayer.vcr.open.error.header");
         String content = i18n.getString("mediaplayer.vcr.open.error.content") + " " +
-                MediaControlsFactoryImplOriginal.getSelectedSerialPort().orElse("<undefined>");
+                MediaControlsFactoryImpl.getSelectedSerialPort().orElse("<undefined>");
         ShowNonfatalErrorAlert alert = new ShowNonfatalErrorAlert(title, header, content, new RuntimeException(ex));
         Initializer.getToolBox()
                 .getEventBus()
@@ -270,4 +270,13 @@ public static Optional<String> getSelectedSerialPort() {
             return Optional.of(serialPort);
         }
     }
+
+    /**
+     * Stores the serialPort value to local preferences
+     * @param serialPort
+     */
+    public static void setSelectedSerialPort(String serialPort) {
+        Preferences prefs = Preferences.userNodeForPackage(MediaControlsFactoryImplOriginal.PREF_NODE_KEY);
+        prefs.put(MediaControlsFactoryImplOriginal.PREF_SERIALPORT_KEY, serialPort);
+    }
 }
diff --git a/...ui/src/main/java/org/mbari/vars/ui/mediaplayers/vcr/MediaControlsFactoryImplOriginal.java b/...ui/src/main/java/org/mbari/vars/ui/mediaplayers/vcr/MediaControlsFactoryImplOriginal.java
@@ -33,6 +33,7 @@
 /**
  * @author Brian Schlining
  * @since 2018-03-26T10:52:00
+ * @deprecated
  */
 public class MediaControlsFactoryImplOriginal implements MediaControlsFactory {
 

diff --git a/...i.vars.ui/src/main/java/org/mbari/vars/ui/mediaplayers/vcr/MediaParamsPaneController.java b/...i.vars.ui/src/main/java/org/mbari/vars/ui/mediaplayers/vcr/MediaParamsPaneController.java
@@ -72,7 +72,7 @@ void initialize() {
         commportComboBox.setEditable(false);
         ObservableList<String> serialPorts = FXCollections.observableArrayList(MediaControlsFactoryImpl.getSerialPorts());
         commportComboBox.setItems(serialPorts);
-        MediaControlsFactoryImplOriginal.getSelectedSerialPort()
+        MediaControlsFactoryImpl.getSelectedSerialPort()
                 .ifPresent(sp -> commportComboBox.getSelectionModel().select(sp));
     }
 

diff --git a/org.mbari.vars.ui/src/main/java/org/mbari/vars/ui/mediaplayers/vcr/OpenTapeService.java b/org.mbari.vars.ui/src/main/java/org/mbari/vars/ui/mediaplayers/vcr/OpenTapeService.java
@@ -25,7 +25,7 @@ public void open(MediaParams mediaParams) {
         MediaService mediaService = toolBox.getServices().getMediaService();
         if (mediaParams.getSerialPort() != null) {
             // Save serial port to preferences, so MediaControlsFactoryImplOriginal can look it up later
-            MediaControlsFactoryImplOriginal.setSelectedSerialPort(mediaParams.getSerialPort());
+            MediaControlsFactoryImpl.setSelectedSerialPort(mediaParams.getSerialPort());
         }
         mediaService.findByUri(mediaParams.getUri())
                 .thenAccept(media -> {