From 4b4280c06b5c12867647ab1598b328ebd8d5ba92 Mon Sep 17 00:00:00 2001
From: ChsBuffer <33744752+chsbuffer@users.noreply.github.com>
Date: Sun, 4 Oct 2020 12:39:24 +0800
Subject: [PATCH] remove: ServerForm.CreateComboBox parse argument

---
 Netch/Forms/ServerForm.cs                           | 5 ++---
 Netch/Servers/Shadowsocks/Form/ShadowsocksForm.cs   | 1 -
 Netch/Servers/ShadowsocksR/Form/ShadowsocksRForm.cs | 3 ---
 Netch/Servers/Trojan/TrojanUtil.cs                  | 2 +-
 Netch/Servers/VMess/Form/VMessForm.cs               | 4 ----
 Netch/Servers/VMess/VMessUtil.cs                    | 2 +-
 6 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Netch/Forms/ServerForm.cs b/Netch/Forms/ServerForm.cs
index 63142a33..0cbefddd 100644
--- a/Netch/Forms/ServerForm.cs
+++ b/Netch/Forms/ServerForm.cs
@@ -62,7 +62,7 @@ namespace Netch.Forms
             );
         }
 
-        protected void CreateComboBox(string name, string remark, List<string> values, Func<string, bool> parse, Action<string> save, string value, int width = InputBoxWidth)
+        protected void CreateComboBox(string name, string remark, List<string> values, Action<string> save, string value, int width = InputBoxWidth)
         {
             _controlLines++;
 
@@ -78,7 +78,6 @@ namespace Netch.Forms
             comboBox.Items.AddRange(values.ToArray());
             comboBox.SelectedIndex = values.IndexOf(value);
             comboBox.DrawItem += Utils.Utils.DrawCenterComboBox;
-            _checkActions.Add(comboBox, parse);
             _saveActions.Add(comboBox, o => save.Invoke((string) o));
             ConfigurationGroupBox.Controls.AddRange(
                 new Control[]
@@ -123,7 +122,7 @@ namespace Netch.Forms
 
         private void ServerForm_Load(object sender, EventArgs e)
         {
-            this.Text = TypeName ?? string.Empty;
+            Text = TypeName ?? string.Empty;
 
             RemarkTextBox.Text = Server.Remark;
             AddressTextBox.Text = Server.Hostname;
diff --git a/Netch/Servers/Shadowsocks/Form/ShadowsocksForm.cs b/Netch/Servers/Shadowsocks/Form/ShadowsocksForm.cs
index 4adbef01..7a0f4baf 100644
--- a/Netch/Servers/Shadowsocks/Form/ShadowsocksForm.cs
+++ b/Netch/Servers/Shadowsocks/Form/ShadowsocksForm.cs
@@ -16,7 +16,6 @@ namespace Netch.Servers.Shadowsocks.Form
                 server.Password);
             CreateComboBox("EncryptMethod", "Encrypt Method",
                 SSGlobal.EncryptMethods,
-                s => SSGlobal.EncryptMethods.Contains(s),
                 s => server.EncryptMethod = s,
                 server.EncryptMethod);
             CreateTextBox("Plugin", "Plugin",
diff --git a/Netch/Servers/ShadowsocksR/Form/ShadowsocksRForm.cs b/Netch/Servers/ShadowsocksR/Form/ShadowsocksRForm.cs
index d775fb73..5f1a9553 100644
--- a/Netch/Servers/ShadowsocksR/Form/ShadowsocksRForm.cs
+++ b/Netch/Servers/ShadowsocksR/Form/ShadowsocksRForm.cs
@@ -16,12 +16,10 @@ namespace Netch.Servers.ShadowsocksR.Form
                 server.Password);
             CreateComboBox("EncryptMethod", "Encrypt Method",
                 SSRGlobal.EncryptMethods,
-                s => SSRGlobal.EncryptMethods.Contains(s),
                 s => server.EncryptMethod = s,
                 server.EncryptMethod);
             CreateComboBox("Protocol", "Protocol",
                 SSRGlobal.Protocols,
-                s => SSRGlobal.Protocols.Contains(s),
                 s => server.Protocol = s,
                 server.Protocol);
             CreateTextBox("ProtocolParam", "Protocol Param",
@@ -30,7 +28,6 @@ namespace Netch.Servers.ShadowsocksR.Form
                 server.ProtocolParam);
             CreateComboBox("OBFS", "OBFS",
                 SSRGlobal.OBFSs,
-                s => SSRGlobal.OBFSs.Contains(s),
                 s => server.OBFS = s,
                 server.OBFS);
             CreateTextBox("OBFSParam", "OBFS Param",
diff --git a/Netch/Servers/Trojan/TrojanUtil.cs b/Netch/Servers/Trojan/TrojanUtil.cs
index 47692f00..422836ae 100644
--- a/Netch/Servers/Trojan/TrojanUtil.cs
+++ b/Netch/Servers/Trojan/TrojanUtil.cs
@@ -11,7 +11,7 @@ namespace Netch.Servers.Trojan
 {
     public class TrojanUtil : IServerUtil
     {
-        public ushort Priority { get; } = 2;
+        public ushort Priority { get; } = 3;
         public string TypeName { get; } = "Trojan";
         public string FullName { get; } = "Trojan";
         public string ShortName { get; } = "TR";
diff --git a/Netch/Servers/VMess/Form/VMessForm.cs b/Netch/Servers/VMess/Form/VMessForm.cs
index 24b39016..f2dbdaed 100644
--- a/Netch/Servers/VMess/Form/VMessForm.cs
+++ b/Netch/Servers/VMess/Form/VMessForm.cs
@@ -21,17 +21,14 @@ namespace Netch.Servers.VMess.Form
                 76);
             CreateComboBox("EncryptMethod", "Encrypt Method",
                 VMessGlobal.EncryptMethods,
-                s => VMessGlobal.EncryptMethods.Contains(s),
                 s => server.EncryptMethod = s,
                 server.EncryptMethod);
             CreateComboBox("TransferProtocol", "Transfer Protocol",
                 VMessGlobal.TransferProtocols,
-                s => VMessGlobal.TransferProtocols.Contains(s),
                 s => server.TransferProtocol = s,
                 server.TransferProtocol);
             CreateComboBox("FakeType", "Fake Type",
                 VMessGlobal.FakeTypes,
-                s => VMessGlobal.FakeTypes.Contains(s),
                 s => server.FakeType = s,
                 server.FakeType);
             CreateTextBox("Host", "Host",
@@ -44,7 +41,6 @@ namespace Netch.Servers.VMess.Form
                 server.Path);
             CreateComboBox("QUICSecurity", "QUIC Security",
                 VMessGlobal.QUIC,
-                s => VMessGlobal.QUIC.Contains(s),
                 s => server.QUIC = s,
                 server.QUIC);
             CreateTextBox("QUICSecret", "QUIC Secret",
diff --git a/Netch/Servers/VMess/VMessUtil.cs b/Netch/Servers/VMess/VMessUtil.cs
index e1ddd89d..98c1192c 100644
--- a/Netch/Servers/VMess/VMessUtil.cs
+++ b/Netch/Servers/VMess/VMessUtil.cs
@@ -11,7 +11,7 @@ namespace Netch.Servers.VMess
 {
     public class VMessUtil : IServerUtil
     {
-        public ushort Priority { get; } = 2;
+        public ushort Priority { get; } = 3;
         public string TypeName { get; } = "VMess";
         public string FullName { get; } = "VMess";
         public string ShortName { get; } = "V2";