From 0cedd7e8e6f9dab0db1a2564738a5e7657f36cce Mon Sep 17 00:00:00 2001
From: 0xboobface <0xboobface@gmail.com>
Date: Tue, 13 Nov 2018 16:10:06 +0100
Subject: [PATCH] Remove calls to private API

---
 src/main/java/ctbrec/ui/ProxySettingsPane.java | 5 ++---
 src/main/java/ctbrec/ui/SettingsTab.java       | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/ctbrec/ui/ProxySettingsPane.java b/src/main/java/ctbrec/ui/ProxySettingsPane.java
index f1015cf5..bd5c3f5b 100644
--- a/src/main/java/ctbrec/ui/ProxySettingsPane.java
+++ b/src/main/java/ctbrec/ui/ProxySettingsPane.java
@@ -4,10 +4,9 @@ import static ctbrec.Settings.ProxyType.*;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.sun.javafx.collections.ObservableListWrapper;
-
 import ctbrec.Config;
 import ctbrec.Settings.ProxyType;
+import javafx.collections.FXCollections;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.scene.control.ComboBox;
@@ -45,7 +44,7 @@ public class ProxySettingsPane extends TitledPane implements EventHandler<Action
         proxyTypes.add(HTTP);
         proxyTypes.add(SOCKS4);
         proxyTypes.add(SOCKS5);
-        proxyType = new ComboBox<>(new ObservableListWrapper<>(proxyTypes));
+        proxyType = new ComboBox<>(FXCollections.observableList(proxyTypes));
         proxyType.setOnAction(this);
         layout.add(proxyType, 1, 0);
 
diff --git a/src/main/java/ctbrec/ui/SettingsTab.java b/src/main/java/ctbrec/ui/SettingsTab.java
index 9cc910d7..bf890d22 100644
--- a/src/main/java/ctbrec/ui/SettingsTab.java
+++ b/src/main/java/ctbrec/ui/SettingsTab.java
@@ -9,8 +9,6 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sun.javafx.collections.ObservableListWrapper;
-
 import ctbrec.Config;
 import ctbrec.Hmac;
 import ctbrec.Settings;
@@ -18,6 +16,7 @@ import ctbrec.sites.ConfigUI;
 import ctbrec.sites.Site;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
+import javafx.collections.FXCollections;
 import javafx.geometry.HPos;
 import javafx.geometry.Insets;
 import javafx.scene.Node;
@@ -326,7 +325,7 @@ public class SettingsTab extends Tab implements TabSelectionListener {
         resolutionOptions.add(600);
         resolutionOptions.add(480);
         resolutionOptions.add(0);
-        maxResolution = new ComboBox<>(new ObservableListWrapper<>(resolutionOptions));
+        maxResolution = new ComboBox<>(FXCollections.observableList(resolutionOptions));
         setMaxResolutionValue();
         maxResolution.setOnAction((e) -> Config.getInstance().getSettings().maximumResolution = maxResolution.getSelectionModel().getSelectedItem());
         layout.add(maxResolution, 1, row++);
@@ -342,7 +341,7 @@ public class SettingsTab extends Tab implements TabSelectionListener {
         options.add(new SplitAfterOption("20 min", 20 * 60));
         options.add(new SplitAfterOption("30 min", 30 * 60));
         options.add(new SplitAfterOption("60 min", 60 * 60));
-        splitAfter = new ComboBox<>(new ObservableListWrapper<>(options));
+        splitAfter = new ComboBox<>(FXCollections.observableList(options));
         layout.add(splitAfter, 1, row++);
         setSplitAfterValue();
         splitAfter.setOnAction((e) -> Config.getInstance().getSettings().splitRecordings = splitAfter.getSelectionModel().getSelectedItem().getValue());