diff --git a/Reseter2/Form1.cs b/Reseter2/Form1.cs index 73f47a5..d4915fa 100644 --- a/Reseter2/Form1.cs +++ b/Reseter2/Form1.cs @@ -9,6 +9,7 @@ using System.Data; using System.Drawing; using System.IO; using System.Linq; +using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.Serialization.Formatters.Binary; using System.Text; @@ -36,7 +37,7 @@ namespace Reseter2 public Form1() { - + SGlobalSetting.LoadSetting(); WordsList.MainCategory = SGlobalSetting.LoadWords(); @@ -50,6 +51,7 @@ namespace Reseter2 //ListComp.SetSelected(1,true); this.SetStyle(ControlStyles.OptimizedDoubleBuffer, true); InitializeComponent(); + AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(CurrentDomain_AssemblyResolve); this.Save += settingWordsControl1.Save; this.Save += settingSCCMControl1.Save; this.Save += settingRebootControl1.Save; @@ -64,6 +66,7 @@ namespace Reseter2 ListComp.Location = new Point(tb_comp.Location.X, tb_comp.Location.Y + tb_comp.Height); ListComp.Width = tb_comp.Width; ListComp.Visible = false; + ListComp.ItemHeight = 14; ListComp.Height = ListComp.ItemHeight * 2; ListComp.Items.Add("Введите запрос"); ListComp.SelectedIndexChanged += ListComp_ChangeIndex; @@ -88,7 +91,14 @@ namespace Reseter2 tabControl1.SelectedIndex = 1; } - + Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args) + { + if (args.Name.Contains("MySql.Data")) + { + return Assembly.Load(Reseter2.Properties.Resources.MySql_Data); + } + return null; + } public void UpdateTree() { @@ -101,22 +111,30 @@ namespace Reseter2 { if (CompSelected == null) { - DialogResult result = MessageBox.Show("Перезагрузить ПК: " + tb_comp.Text.Trim(), "Создание новой задачи", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); - if (result == DialogResult.Yes) + if (tb_comp.Text.Length > 0) { - Reseter.AddTask(tb_comp.Text.Trim()); - tabControl1.SelectedIndex = 0; - ListComp.SelectedIndex = -1; - StopRefreshSeacher = true; - tb_comp.Text = ""; - ListComp.Items.Clear(); - ListComp.Items.Add("Введите запрос"); - ListComp.Height = ListComp.ItemHeight * 2; - StopRefreshSeacher = false; - ListComp.Visible = false; - tabControl1.SelectedIndex = 0; + DialogResult result = MessageBox.Show("Перезагрузить ПК: " + tb_comp.Text.Trim(), "Создание новой задачи", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); + if (result == DialogResult.Yes) + { + Reseter.AddTask(tb_comp.Text.Trim()); + tabControl1.SelectedIndex = 0; + ListComp.SelectedIndex = -1; + StopRefreshSeacher = true; + tb_comp.Text = ""; + ListComp.Items.Clear(); + ListComp.Items.Add("Введите запрос"); + ListComp.Enabled = false; + ListComp.ItemHeight = 14; + ListComp.Height = ListComp.ItemHeight * 2; + StopRefreshSeacher = false; + ListComp.Visible = false; + tabControl1.SelectedIndex = 0; + } + } + else + { + MessageBox.Show("Введите имя ПК","Ошибка перезагрузки",MessageBoxButtons.OK,MessageBoxIcon.Warning); } - } else { @@ -130,6 +148,8 @@ namespace Reseter2 tb_comp.Text = ""; ListComp.Items.Clear(); ListComp.Items.Add("Введите запрос"); + ListComp.ItemHeight = 14; + ListComp.Enabled = false; ListComp.Height = ListComp.ItemHeight * 2; StopRefreshSeacher = false; ListComp.Visible = false; @@ -554,10 +574,11 @@ namespace Reseter2 } } - public void cb_comp_ResultUpdate(List Items, bool enable) + public void cb_comp_ResultUpdate(List Items, bool enable, int itemHeight) { PreSelected = -1; - if (ListComp.Items.Count != Items.Count) ListComp.Height = ListComp.ItemHeight * (Items.Count+1) ; + ListComp.ItemHeight = itemHeight; + ListComp.Height = ListComp.ItemHeight * (Items.Count+1) ; ListComp.Items.Clear(); ListComp.Items.AddRange(Items.ToArray()); ListComp.Enabled = enable; @@ -590,7 +611,7 @@ namespace Reseter2 PreSelected = ListComp.SelectedIndex; // Console.WriteLine(ListComp.SelectedItem.ToString()); StopRefreshSeacher = true; - tb_comp.Text = ListComp.SelectedItem.ToString(); + tb_comp.Text = SSeaher.seaherMetod.ResultString(ListComp.SelectedIndex); StopRefreshSeacher = false; ListComp.Refresh(); } @@ -603,7 +624,8 @@ namespace Reseter2 { if (e.Index != -1) { - if(e.Index == PreSelected) + Point BoundNew = new(e.Bounds.Location.X, e.Bounds.Y + 1); + if (e.Index == PreSelected) { e.Graphics.FillRectangle(Brushes.LightGray, e.Bounds); } @@ -616,11 +638,11 @@ namespace Reseter2 if(e.Index == ListComp.SelectedIndex) { e.Graphics.FillRectangle(Brushes.DodgerBlue, e.Bounds); - e.Graphics.DrawString(ListComp.Items[e.Index].ToString(), e.Font, Brushes.White, e.Bounds.Location); + e.Graphics.DrawString(ListComp.Items[e.Index].ToString(), e.Font, Brushes.White, BoundNew); } else { - e.Graphics.DrawString(ListComp.Items[e.Index].ToString(), e.Font, Brushes.Black, e.Bounds.Location); + e.Graphics.DrawString(ListComp.Items[e.Index].ToString(), e.Font, Brushes.Black, BoundNew); } diff --git a/Reseter2/Properties/MySql.Data.dll b/Reseter2/Properties/MySql.Data.dll new file mode 100644 index 0000000..f8788d5 Binary files /dev/null and b/Reseter2/Properties/MySql.Data.dll differ diff --git a/Reseter2/Properties/Resources.Designer.cs b/Reseter2/Properties/Resources.Designer.cs index a5eb57c..986a540 100644 --- a/Reseter2/Properties/Resources.Designer.cs +++ b/Reseter2/Properties/Resources.Designer.cs @@ -1,71 +1,73 @@ //------------------------------------------------------------------------------ // -// Этот код создан программным средством. -// Версия среды выполнения: 4.0.30319.42000 +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 // -// Изменения в этом файле могут привести к неправильному поведению и будут утрачены, если -// код создан повторно. +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. // //------------------------------------------------------------------------------ -namespace Reseter2.Properties -{ - - +namespace Reseter2.Properties { + using System; + + /// - /// Класс ресурсов со строгим типом для поиска локализованных строк и пр. + /// Класс ресурса со строгой типизацией для поиска локализованных строк и т.д. /// - // Этот класс был автоматически создан при помощи StronglyTypedResourceBuilder - // класс с помощью таких средств, как ResGen или Visual Studio. - // Для добавления или удаления члена измените файл .ResX, а затем перезапустите ResGen - // с параметром /str или заново постройте свой VS-проект. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + // Этот класс создан автоматически классом StronglyTypedResourceBuilder + // с помощью такого средства, как ResGen или Visual Studio. + // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen + // с параметром /str или перестройте свой проект VS. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// - /// Возврат кэшированного экземпляра ResourceManager, используемого этим классом. + /// Возвращает кэшированный экземпляр ResourceManager, использованный этим классом. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Reseter2.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// - /// Переопределяет свойство CurrentUICulture текущего потока для всех - /// подстановки ресурсов с помощью этого класса ресурсов со строгим типом. + /// Перезаписывает свойство CurrentUICulture текущего потока для всех + /// обращений к ресурсу с помощью этого класса ресурса со строгой типизацией. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } + + /// + /// Поиск локализованного ресурса типа System.Byte[]. + /// + internal static byte[] MySql_Data { + get { + object obj = ResourceManager.GetObject("MySql_Data", resourceCulture); + return ((byte[])(obj)); + } + } } } diff --git a/Reseter2/Properties/Resources.resx b/Reseter2/Properties/Resources.resx index af7dbeb..c43ed49 100644 --- a/Reseter2/Properties/Resources.resx +++ b/Reseter2/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + MySql.Data.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/Reseter2/Reseter2.csproj b/Reseter2/Reseter2.csproj index b8c1a28..bc6f37c 100644 --- a/Reseter2/Reseter2.csproj +++ b/Reseter2/Reseter2.csproj @@ -56,7 +56,7 @@ False - .\MySql.Data.dll + Properties\MySql.Data.dll @@ -100,7 +100,6 @@ - @@ -195,6 +194,7 @@ True Resources.resx + True SettingRebootControl.cs @@ -237,6 +237,8 @@ + + diff --git a/Reseter2/SCCMsearch/AuthLogin.cs b/Reseter2/SCCMsearch/AuthLogin.cs index 43b190d..a9f7194 100644 --- a/Reseter2/SCCMsearch/AuthLogin.cs +++ b/Reseter2/SCCMsearch/AuthLogin.cs @@ -4,19 +4,29 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Windows.Forms; namespace Reseter2.SCCMsearch { internal class AuthLogin : IAuthType { + private string User = null; + private string Pass = null; public AuthLogin() { } + + public AuthLogin(string user, string pass) + { + User = user; + Pass = pass; + } public string Name { get { + if(User != null) return User; return SGlobalSetting.settingSCCM.username; } } @@ -24,6 +34,7 @@ namespace Reseter2.SCCMsearch { get { + if(Pass != null) return Pass; return SGlobalSetting.settingSCCM.password; } } diff --git a/Reseter2/SCCMsearch/SQLconnector.cs b/Reseter2/SCCMsearch/SQLconnector.cs deleted file mode 100644 index 3ac61a2..0000000 --- a/Reseter2/SCCMsearch/SQLconnector.cs +++ /dev/null @@ -1,38 +0,0 @@ -using Reseter2.Setting; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using MySql.Data; - -namespace Reseter2.SCCMsearch -{ - internal class SQLconnector - { - private MySql.Data.MySqlClient.MySqlConnection Connection; - private IAuthType AuthType; - public SQLconnector() - { - if (SGlobalSetting.settingSCCM.windowsAuth) - { - AuthType = new AuthWin(); - } - else - { - AuthType = new AuthLogin(); - } - string stringConnect = "server=" + SGlobalSetting.settingSCCM.server + ";database=" + SGlobalSetting.settingSCCM.dataBase + ";" + AuthType.AuthString(); - try - { - Connection = new MySql.Data.MySqlClient.MySqlConnection(stringConnect); - Connection.Open(); - } - catch - { - Console.WriteLine("Повторное бы подключение"); - } - - } - } -} diff --git a/Reseter2/Seacher/ISeaherMetod.cs b/Reseter2/Seacher/ISeaherMetod.cs index cbf9fad..2f0e48d 100644 --- a/Reseter2/Seacher/ISeaherMetod.cs +++ b/Reseter2/Seacher/ISeaherMetod.cs @@ -11,6 +11,7 @@ namespace Reseter2.Seacher { public void Change(ResultUpdate sender, string seach); public IComp Result(int index); + public string ResultString(int index); public void Activate(); public void Deactivate(); diff --git a/Reseter2/Seacher/SeachSCCM.cs b/Reseter2/Seacher/SeachSCCM.cs index 1c53667..4e11418 100644 --- a/Reseter2/Seacher/SeachSCCM.cs +++ b/Reseter2/Seacher/SeachSCCM.cs @@ -1,4 +1,5 @@ using MySql.Data.MySqlClient; +using MySqlX.XDevAPI.Common; using MySqlX.XDevAPI.Relational; using Reseter2.SCCMsearch; using Reseter2.Setting; @@ -11,7 +12,9 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using System.Windows.Forms; +using System.Xml.Linq; using static Reseter2.Seacher.SeahcLocal; +using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel; namespace Reseter2.Seacher { @@ -23,6 +26,14 @@ namespace Reseter2.Seacher private ResultUpdate Update; private bool enable; private string error; + private Mode mode; + + private enum Mode{ + PCname, + Login, + Username + } + public SeachSCCM() { if (SGlobalSetting.settingSCCM.windowsAuth) @@ -34,6 +45,19 @@ namespace Reseter2.Seacher AuthType = new AuthLogin(); } + } + + public SeachSCCM(bool AuthMetod, string User = "", string Pass = "") + { + if (AuthMetod) + { + AuthType = new AuthWin(); + } + else + { + AuthType = new AuthLogin(User, Pass); + } + } public void Change(ResultUpdate sender, string seach) { @@ -41,46 +65,55 @@ namespace Reseter2.Seacher Update = sender; if (Connection.State == ConnectionState.Open) { - + List result; if (seach.Length > 2) { - - Update(ResultSeach(seach), enable); + result = ResultSeach(seach); + int itemHeight = 14; + if(enable) itemHeight = 40; + Update(result, enable, itemHeight); } else { - List result = new List(); + result = new List(); result.Add("Введите запрос, к бд подключенно"); - Update(result, false); + Update(result, false, 14); } } else { List result = new List(); result.Add(error); - Update(result, false); + Update(result, false,14); } } private string QueryBilder(string query) { - string result = ""; - Regex regexCyrillic = new(@"\p{IsCyrillic}*", RegexOptions.IgnoreCase); - Regex regexNumrable = new(@"\d*", RegexOptions.IgnoreCase); + string result; + Regex regexCyrillic = new(@"\p{IsCyrillic}+", RegexOptions.IgnoreCase); + Regex regexNumrable = new(@"\d+", RegexOptions.IgnoreCase); + MatchCollection jjj = regexNumrable.Matches(query); if (regexCyrillic.Matches(query).Count > 0) { - result = "SELECT * FROM " + SGlobalSetting.settingSCCM.dataBase + " WHERE pcname LIKE '%" + query + "%'"; + result = "SELECT test.pcname, test.login, username_tb.username, test.action FROM username_tb JOIN test ON username_tb.login=test.login WHERE LOWER(username_tb.username) LIKE LOWER('%" + query + "%') LIMIT 15"; + mode = Mode.Username; } else if(regexNumrable.Matches(query).Count > 0) { - result = "SELECT * FROM " + SGlobalSetting.settingSCCM.dataBase + " WHERE pcname LIKE '%" + query + "%'"; + + + result = "SELECT test.pcname, test.login, username_tb.username, test.action FROM test LEFT JOIN username_tb ON test.login = username_tb.login WHERE LOWER(test.pcname) LIKE LOWER('%" + query + "%') LIMIT 15"; + mode = Mode.PCname; } else { - result = "SELECT * FROM " + SGlobalSetting.settingSCCM.dataBase + " WHERE login LIKE '%" + query + "%'"; + result = "SELECT test.pcname, test.login, username_tb.username, test.action FROM test LEFT JOIN username_tb ON test.login = username_tb.login WHERE LOWER(test.pcname) LIKE LOWER('%" + query + "%') OR LOWER(test.login) LIKE LOWER('%" + query + "%') LIMIT 15" + + ""; ; + mode = Mode.Login; } - return null; + return result; } public List ResultSeach(string seach) { @@ -102,10 +135,11 @@ namespace Reseter2.Seacher DataRow[] myData = dt.Select(); for (int i = 0; i < myData.Length; i++) { - IComp comp = new CompId(myData[i].ItemArray[1].ToString()); - comp.SetName(myData[i].ItemArray[2].ToString()); + IComp comp = new CompId(myData[i].ItemArray[0].ToString()); + comp.SetName(myData[i].ItemArray[1].ToString()); + comp.SetDescription(myData[i].ItemArray[2].ToString()); comps.Add(comp); - result.Add(comp.GetName() + "(" + comp.GetNetNameStr() + ")"); + result.Add("ПК:"+ comp.GetNetNameStr() + " Логин:" + comp.GetName() + "\r\n" + comp.GetDescription() + "\r\nLastLogin:" + myData[i].ItemArray[3].ToString()); ++y; } enable = true; @@ -131,7 +165,7 @@ namespace Reseter2.Seacher { if (Connection == null) { - string stringConnect = "server=" + SGlobalSetting.settingSCCM.server + ";database=" + SGlobalSetting.settingSCCM.dataBase + ";" + AuthType.AuthString(); + string stringConnect = "server=" + SGlobalSetting.settingSCCM.server + ";database=" + SGlobalSetting.settingSCCM.dataBase + ";" + AuthType.AuthString() + ";charset=utf8"; try { Connection = new MySql.Data.MySqlClient.MySqlConnection(stringConnect); @@ -158,5 +192,61 @@ namespace Reseter2.Seacher { return comps[index]; } + public string ResultString(int index) + { + switch (mode) + { + case Mode.Login: + return comps[index].GetName(); + case Mode.Username: + return comps[index].GetDescription(); + case Mode.PCname: + return comps[index].GetNetNameStr(); + } + return ""; + } + public string CheckConnect(string server, string basa) + { + if (Connection == null) + { + string stringConnect = "server=" + server + ";database=" + basa + ";" + AuthType.AuthString() + ";charset=utf8"; + try + { + Connection = new MySql.Data.MySqlClient.MySqlConnection(stringConnect); + Connection.Open(); + error = "Подключенно"; + } + catch + { + error = "Не удалось подключиться к серверу"; + } + } + if (Connection.State == ConnectionState.Open) + { + try + { + string sql = "SELECT * FROM test LIMIT 1"; + MySqlCommand sqlCom = new MySqlCommand(sql, Connection); + sqlCom.ExecuteNonQuery(); + MySqlDataAdapter dataAdapter = new MySqlDataAdapter(sqlCom); + DataTable dt = new DataTable(); + dataAdapter.Fill(dt); + + DataRow[] myData = dt.Select(); + if(myData.Length > 0) + { + error = "Соединие успешно установленно"; + } + + } + catch + { + error = "Ошибка выполнения запроса \nКакая то не правильная база"; + } + + } + return error; + } + } } diff --git a/Reseter2/Seacher/SeahcLocal.cs b/Reseter2/Seacher/SeahcLocal.cs index 3f3c945..019d9be 100644 --- a/Reseter2/Seacher/SeahcLocal.cs +++ b/Reseter2/Seacher/SeahcLocal.cs @@ -9,7 +9,7 @@ namespace Reseter2.Seacher { internal class SeahcLocal : ISeaherMetod { - internal delegate void ResultUpdate(List Item, bool eneble); + internal delegate void ResultUpdate(List Item, bool eneble, int itemHeight); private ResultUpdate Update; private List comps = new List(); private bool enable; @@ -19,13 +19,13 @@ namespace Reseter2.Seacher if (seach.Length > 2) { - Update(ResultSeach(seach), enable); + Update(ResultSeach(seach), enable,14); } else { List result = new List(); result.Add("Введите запрос"); - Update(result,false); + Update(result,false, 14); } } @@ -66,6 +66,22 @@ namespace Reseter2.Seacher { return comps[index]; } + + public string ResultString(int index) + { + string buf; + if (comps[index].GetName() == null) + { + buf = comps[index].GetNetNameStr(); + } + else + { + buf = comps[index].GetName(); + if (comps[index].GetNetNameStr() != null) buf += "(" + comps[index].GetNetNameStr() + ")"; + + } + return buf; + } public void Activate() { } public void Deactivate() { } } diff --git a/Reseter2/Setting/SettingSCCMControl.Designer.cs b/Reseter2/Setting/SettingSCCMControl.Designer.cs index fe5b024..e551e8a 100644 --- a/Reseter2/Setting/SettingSCCMControl.Designer.cs +++ b/Reseter2/Setting/SettingSCCMControl.Designer.cs @@ -71,6 +71,7 @@ this.bt_checkConnect.TabIndex = 11; this.bt_checkConnect.Text = "Проверить связь"; this.bt_checkConnect.UseVisualStyleBackColor = true; + this.bt_checkConnect.Click += new System.EventHandler(this.bt_checkConnect_Click); // // label10 // diff --git a/Reseter2/Setting/SettingSCCMControl.cs b/Reseter2/Setting/SettingSCCMControl.cs index efa0795..ce341df 100644 --- a/Reseter2/Setting/SettingSCCMControl.cs +++ b/Reseter2/Setting/SettingSCCMControl.cs @@ -1,4 +1,5 @@ -using System; +using Reseter2.Seacher; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -78,5 +79,11 @@ namespace Reseter2.Setting SGlobalSetting.settingSCCM.windowsAuth = cb_windowsAuth.Checked; } + + private void bt_checkConnect_Click(object sender, EventArgs e) + { + SeachSCCM SeacherCheck = new(cb_windowsAuth.Checked, ib_username.Text, ib_password.Text); + MessageBox.Show(SeacherCheck.CheckConnect(ib_server.Text,ib_dataBase.Text)); + } } } diff --git a/Reseter2/reseter.cs b/Reseter2/reseter.cs index 4f846f1..301cbfb 100644 --- a/Reseter2/reseter.cs +++ b/Reseter2/reseter.cs @@ -33,16 +33,12 @@ namespace Reseter2 CompId compid = new CompId(ip); AddTask(compid); } - catch (FormatException e) + catch { CompId compid = new CompId(name); AddTask(compid); } - catch - { - - } - + } public static void AddTask(List comps)