From 9373b38d7edd72bc84dc8e1df35586be17f47cea Mon Sep 17 00:00:00 2001 From: Garifullin-Farid <95081032+Garifullin-Farid@users.noreply.github.com> Date: Mon, 6 May 2024 22:46:50 +0400 Subject: [PATCH] fix --- .../.CollectionType.cs.swp | Bin 0 -> 12288 bytes .../.CollectionType_BASE_1418.cs.swp | Bin 0 -> 12288 bytes .../.CollectionType_LOCAL_1418.cs.swp | Bin 0 -> 12288 bytes .../.CollectionType_REMOTE_1418.cs.swp | Bin 0 -> 12288 bytes .../CollectionType_BACKUP_1418.cs | 25 ++++++ .../CollectionType_BASE_1418.cs | 17 ++++ .../CollectionType_LOCAL_1418.cs | 21 +++++ .../CollectionType_REMOTE_1418.cs | 17 ++++ .../StorageCollection_BACKUP_1588.cs | 83 ++++++++++++++++++ .../StorageCollection_BASE_1588.cs | 75 ++++++++++++++++ .../StorageCollection_LOCAL_1588.cs | 73 +++++++++++++++ .../StorageCollection_REMOTE_1588.cs | 79 +++++++++++++++++ 12 files changed, 390 insertions(+) create mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType.cs.swp create mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType_BASE_1418.cs.swp create mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType_LOCAL_1418.cs.swp create mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType_REMOTE_1418.cs.swp create mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_BACKUP_1418.cs create mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_BASE_1418.cs create mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_LOCAL_1418.cs create mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_REMOTE_1418.cs create mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BACKUP_1588.cs create mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BASE_1588.cs create mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_LOCAL_1588.cs create mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_REMOTE_1588.cs diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType.cs.swp b/ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType.cs.swp new file mode 100644 index 0000000000000000000000000000000000000000..a66b1897763edaddaf74816b6e5b50fc91419e3a GIT binary patch literal 12288 zcmeI2OK%cU6vuB}bXPUHa$&scR+$%%A*D^4wqm1wBqIBHT#`{32m>ah(Sjz%WnH<^ zh5ZD^NJ6NEg$ol`clP=T{0_$d0D?5Ft{cuFzg*_b;mp0i9hqaR`Hf9(#&m|b$XMg5 zR!Hv8GcnIt!K!+0l>bkxtv|Sz+upgI%4b(~J$-7m;wa$@c_cfstLQvz$+r9~+hHqw z9yS%(!>6w+JJs?d;nZ@L|9I;AYPncM-YffA;ft#0Y}-*?piFM$8Wj<9f>WPQH^{(j z8(3h5uBnlOn>ViW%afDDiUGC&5%02!Du1GUN=+ryd9jm~{#w9Xw{ zN0+pa0Wv@a$N(8217v^BX^ zAn=|Dw9;-(YEJ0&R(`|$q!gB^9lmq>Mn#p7dUhQaTyudFfODv6+CIfDN+NFSSQb9#7wk^Khz C2Ioc6tCW#?0tyAu08;AJwr?s)F7a+UAcQ|V}5Agec0#hjY|`D12i-uP;CC+y(G zUxFJDs6~MW>NJgHbn^DLR?*TtTZ;%dGXx+20SG_<0uX=z1Zq|wpR1z{KK+M^KvQL| zdooupF+l(V5P$##AOHafKmY;|fB*y_@E;0T{DOa}k?4{Wz5jps|9|t5=$f<7+2ibR z);Y_ZUz|}+7pINW#QDq5-*Ij^SDdKc1qTBH5P$##AOHafKmY;|fB*y_@SXzeBzTNF zL0do4QJv)Lb+)+`p1a?}O`Z=pC!8}~ex~LcD0_=*|ClR7UGjGuc(JVihEoBBrKb?6qvx39KfYkWIuWVx!bV`56H=aSzn53}>`yDu}(ZP~YwUcSDlW>c|B zcZ#X6(_*GYie4?alf?fsuFc=NkAs$r11rwTD;O7cSUZh74^3AGQ$>uUwvn$Sd zXExj?3Z({lTHpkbLylzdgS&5I^dCMfCgxQ255i=Xn+Q2U~&!At5fm> z$KN+laBMJ7ZJP&6PBcIRG(ZD1Km#;D12jMbG(ZD1Km&WwfQKLaCk}|b1j+yZKi~iM zpvY(N9=rw*!2?hP^S}kC!3;PIe&YQf;5+yRzJPVG23~=r{tLiC12jMbG(ZD1Km#;D z12jMbG(ZC)k40f*gQ%`9E4RPUTB|u7HOghL*1R$d*|)Z5+vp+h+RiXIH%#k?7QHA6 z?i-YH&Wv()sP)FKqYJ%-#`F)PyzyE$D`8S7{qI6+XlX|md%TMIBiIC6w!1^oM^bGR zN`bFT*eI*<9(LJw=45H#VRt=cJE*_euiJ^ABh>z#Jlt&Pl}%Lje53wqq)(0Nk2lX> Fl3%w%*7^Vd literal 0 HcmV?d00001 diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType_REMOTE_1418.cs.swp b/ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType_REMOTE_1418.cs.swp new file mode 100644 index 0000000000000000000000000000000000000000..92fd60296ca27fc1cdb0569e728f9413df3f5d92 GIT binary patch literal 12288 zcmeI&&q^Cn6bA4U7w-JO7H+Le&CQGjEowJ0h}0OV(Pd>ay~4y~5;BQki)id?DCirA zD2Ud$RS~?i>^t}no++tu#OTJ2f;vw&Zlu?XYWZ6tnMx;?jZel{)b^VG z7Tkb9>j`wwh-t)v=l(eGLG<-5wjKeV7y=N000bZa0SG_<0xc|1E=FjRpTDhc&{N+d zPxksHHV8lf0uX=z1Rwwb2tWV=5P$##-l2fSFZi>aMAw|){r~^}|GJClmUF~8BHefs4QuDp0lR7lQGmNd8XBlKHvfN zD$leZHtIsH<_d1mC-!omT^@$#`FDSd_an|3=UmsG>G_L_l}ygDg>ox-5uSc0a;?1b Sik7X!qe1#;qbfW+KTh{Z%( +/// Тип коллекции +/// +======= + +>>>>>>> d84f98706403d56e8dae185838815e23bb91f4d7 +public enum CollectionType +{ + /// + /// Неопределено + /// + None = 0, + + /// + /// Массив + /// + Massive = 1, + + /// + /// Список + /// + List = 2 +} \ No newline at end of file diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_BASE_1418.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_BASE_1418.cs new file mode 100644 index 0000000..75d6067 --- /dev/null +++ b/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_BASE_1418.cs @@ -0,0 +1,17 @@ +namespace ProjectLinkor.CollectionGenericObjects; + +public enum CollectionType +{ + /// + /// Неопределено + /// + None = 0, + /// + /// Массив + /// + Massive = 1, + /// + /// Список + /// + List = 2 +} \ No newline at end of file diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_LOCAL_1418.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_LOCAL_1418.cs new file mode 100644 index 0000000..93d9dff --- /dev/null +++ b/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_LOCAL_1418.cs @@ -0,0 +1,21 @@ +namespace ProjectTank.CollectionGenericObjects; +/// +/// Тип коллекции +/// +public enum CollectionType +{ + /// + /// Неопределено + /// + None = 0, + + /// + /// Массив + /// + Massive = 1, + + /// + /// Список + /// + List = 2 +} \ No newline at end of file diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_REMOTE_1418.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_REMOTE_1418.cs new file mode 100644 index 0000000..f4bf31f --- /dev/null +++ b/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_REMOTE_1418.cs @@ -0,0 +1,17 @@ +namespace ProjectTank.CollectionGenericObjects; + +public enum CollectionType +{ + /// + /// Неопределено + /// + None = 0, + /// + /// Массив + /// + Massive = 1, + /// + /// Список + /// + List = 2 +} \ No newline at end of file diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BACKUP_1588.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BACKUP_1588.cs new file mode 100644 index 0000000..24dd440 --- /dev/null +++ b/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BACKUP_1588.cs @@ -0,0 +1,83 @@ +<<<<<<< HEAD + +======= +using ProjectLinkor.CollectionGenericObjects; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +>>>>>>> parent of 5665ee3 (fix) +namespace ProjectTank.CollectionGenericObjects +{ + public class StorageCollection + where T : class + { + /// + /// Словарь (хранилище) с коллекциями + /// + readonly Dictionary> _storages; + /// + /// Возвращение списка названий коллекций + /// + public List Keys => _storages.Keys.ToList(); + /// + /// Конструктор + /// + public StorageCollection() + { + _storages = new Dictionary>(); + } + /// + /// Добавление коллекции в хранилище + /// + /// Название коллекции + /// тип коллекции + public void AddCollection(string name, CollectionType collectionType) + { + // TODO проверка, что name не пустой и нет в словаре записи с таким ключом + // TODO Прописать логику для добавления + if (name == null || _storages.ContainsKey(name)) + return; + switch (collectionType) + { + case CollectionType.None: + return; + case CollectionType.Massive: + _storages[name] = new MassiveGenericObjects(); + return; + case CollectionType.List: + _storages[name] = new ListGenericObjects(); + return; + } + + } + /// + /// Удаление коллекции + /// + /// Название коллекции + public void DelCollection(string name) + { + // TODO Прописать логику для удаления коллекции + if (_storages.ContainsKey(name)) + _storages.Remove(name); + } + /// + /// Доступ к коллекции + /// + /// Название коллекции + /// + public ICollectionGenericObjects? this[string name] + { + get + { + // TODO Продумать логику получения объекта + if (name == null || !_storages.ContainsKey(name)) + return null; + return _storages[name]; + } + } + + } +} diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BASE_1588.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BASE_1588.cs new file mode 100644 index 0000000..4345763 --- /dev/null +++ b/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BASE_1588.cs @@ -0,0 +1,75 @@ +using ProjectLinkor.CollectionGenericObjects; + + +namespace ProjectTank.CollectionGenericObjects +{ + public class StorageCollection + where T : class + { + /// + /// Словарь (хранилище) с коллекциями + /// + readonly Dictionary> _storages; + /// + /// Возвращение списка названий коллекций + /// + public List Keys => _storages.Keys.ToList(); + /// + /// Конструктор + /// + public StorageCollection() + { + _storages = new Dictionary>(); + } + /// + /// Добавление коллекции в хранилище + /// + /// Название коллекции + /// тип коллекции + public void AddCollection(string name, CollectionType collectionType) + { + // TODO проверка, что name не пустой и нет в словаре записи с таким ключом + // TODO Прописать логику для добавления + if (name == null || _storages.ContainsKey(name)) + return; + switch (collectionType) + { + case CollectionType.None: + return; + case CollectionType.Massive: + _storages[name] = new MassiveGenericObjects(); + return; + case CollectionType.List: + _storages[name] = new ListGenericObjects(); + return; + } + + } + /// + /// Удаление коллекции + /// + /// Название коллекции + public void DelCollection(string name) + { + // TODO Прописать логику для удаления коллекции + if (_storages.ContainsKey(name)) + _storages.Remove(name); + } + /// + /// Доступ к коллекции + /// + /// Название коллекции + /// + public ICollectionGenericObjects? this[string name] + { + get + { + // TODO Продумать логику получения объекта + if (name == null || !_storages.ContainsKey(name)) + return null; + return _storages[name]; + } + } + + } +} diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_LOCAL_1588.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_LOCAL_1588.cs new file mode 100644 index 0000000..6b0bc15 --- /dev/null +++ b/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_LOCAL_1588.cs @@ -0,0 +1,73 @@ + +namespace ProjectTank.CollectionGenericObjects +{ + public class StorageCollection + where T : class + { + /// + /// Словарь (хранилище) с коллекциями + /// + readonly Dictionary> _storages; + /// + /// Возвращение списка названий коллекций + /// + public List Keys => _storages.Keys.ToList(); + /// + /// Конструктор + /// + public StorageCollection() + { + _storages = new Dictionary>(); + } + /// + /// Добавление коллекции в хранилище + /// + /// Название коллекции + /// тип коллекции + public void AddCollection(string name, CollectionType collectionType) + { + // TODO проверка, что name не пустой и нет в словаре записи с таким ключом + // TODO Прописать логику для добавления + if (name == null || _storages.ContainsKey(name)) + return; + switch (collectionType) + { + case CollectionType.None: + return; + case CollectionType.Massive: + _storages[name] = new MassiveGenericObjects(); + return; + case CollectionType.List: + _storages[name] = new ListGenericObjects(); + return; + } + + } + /// + /// Удаление коллекции + /// + /// Название коллекции + public void DelCollection(string name) + { + // TODO Прописать логику для удаления коллекции + if (_storages.ContainsKey(name)) + _storages.Remove(name); + } + /// + /// Доступ к коллекции + /// + /// Название коллекции + /// + public ICollectionGenericObjects? this[string name] + { + get + { + // TODO Продумать логику получения объекта + if (name == null || !_storages.ContainsKey(name)) + return null; + return _storages[name]; + } + } + + } +} diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_REMOTE_1588.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_REMOTE_1588.cs new file mode 100644 index 0000000..368bdcb --- /dev/null +++ b/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_REMOTE_1588.cs @@ -0,0 +1,79 @@ +using ProjectLinkor.CollectionGenericObjects; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectTank.CollectionGenericObjects +{ + public class StorageCollection + where T : class + { + /// + /// Словарь (хранилище) с коллекциями + /// + readonly Dictionary> _storages; + /// + /// Возвращение списка названий коллекций + /// + public List Keys => _storages.Keys.ToList(); + /// + /// Конструктор + /// + public StorageCollection() + { + _storages = new Dictionary>(); + } + /// + /// Добавление коллекции в хранилище + /// + /// Название коллекции + /// тип коллекции + public void AddCollection(string name, CollectionType collectionType) + { + // TODO проверка, что name не пустой и нет в словаре записи с таким ключом + // TODO Прописать логику для добавления + if (name == null || _storages.ContainsKey(name)) + return; + switch (collectionType) + { + case CollectionType.None: + return; + case CollectionType.Massive: + _storages[name] = new MassiveGenericObjects(); + return; + case CollectionType.List: + _storages[name] = new ListGenericObjects(); + return; + } + + } + /// + /// Удаление коллекции + /// + /// Название коллекции + public void DelCollection(string name) + { + // TODO Прописать логику для удаления коллекции + if (_storages.ContainsKey(name)) + _storages.Remove(name); + } + /// + /// Доступ к коллекции + /// + /// Название коллекции + /// + public ICollectionGenericObjects? this[string name] + { + get + { + // TODO Продумать логику получения объекта + if (name == null || !_storages.ContainsKey(name)) + return null; + return _storages[name]; + } + } + + } +}