From 138eb45634d24032cbc1fee8427c847a508c81fb Mon Sep 17 00:00:00 2001
From: AnnaLioness <annalyovushkina@yandex.ru>
Date: Fri, 6 Oct 2023 20:34:43 +0400
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Lab1ContainersShip/DrawingShip.cs         |   6 +
 ...igner.cs => FormContainerShip.Designer.cs} |   0
 .../{Form1.cs => FormContainerShip.cs}        |   0
 .../{Form1.resx => FormContainerShip.resx}    |   0
 .../Lab1ContainersShip.csproj                 |  12 +-
 .../Lab1ContainersShip/Program.cs             |   2 +-
 .../Lab1ContainersShip/SetGeneric.cs          |  12 ++
 .../Lab1ContainersShip/ShipCollection.resx    | 120 ++++++++++++++++++
 .../ShipGenericCollection.cs                  |  12 ++
 9 files changed, 158 insertions(+), 6 deletions(-)
 rename Lab1ContainersShip/Lab1ContainersShip/{Form1.Designer.cs => FormContainerShip.Designer.cs} (100%)
 rename Lab1ContainersShip/Lab1ContainersShip/{Form1.cs => FormContainerShip.cs} (100%)
 rename Lab1ContainersShip/Lab1ContainersShip/{Form1.resx => FormContainerShip.resx} (100%)
 create mode 100644 Lab1ContainersShip/Lab1ContainersShip/SetGeneric.cs
 create mode 100644 Lab1ContainersShip/Lab1ContainersShip/ShipCollection.resx
 create mode 100644 Lab1ContainersShip/Lab1ContainersShip/ShipGenericCollection.cs

diff --git a/Lab1ContainersShip/Lab1ContainersShip/DrawingShip.cs b/Lab1ContainersShip/Lab1ContainersShip/DrawingShip.cs
index a080e88..f2c0173 100644
--- a/Lab1ContainersShip/Lab1ContainersShip/DrawingShip.cs
+++ b/Lab1ContainersShip/Lab1ContainersShip/DrawingShip.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Lab1ContainersShip.Entities;
+using Lab1ContainersShip.MovementStrategy;
 
 namespace Lab1ContainersShip.DrawingObjects
 {
@@ -52,6 +53,11 @@ namespace Lab1ContainersShip.DrawingObjects
         /// Высота объекта
         /// </summary>
         public int GetHeight => _shipHeight;
+        /// <summary>
+        /// Получение объекта IMoveableObject из объекта DrawningCar
+        /// </summary>
+        public IMoveableObject GetMoveableObject => new
+        DrawningObjectShip(this);
         public bool CanMove(Direction direction)
         {
             if(EntityShip == null) return false;
diff --git a/Lab1ContainersShip/Lab1ContainersShip/Form1.Designer.cs b/Lab1ContainersShip/Lab1ContainersShip/FormContainerShip.Designer.cs
similarity index 100%
rename from Lab1ContainersShip/Lab1ContainersShip/Form1.Designer.cs
rename to Lab1ContainersShip/Lab1ContainersShip/FormContainerShip.Designer.cs
diff --git a/Lab1ContainersShip/Lab1ContainersShip/Form1.cs b/Lab1ContainersShip/Lab1ContainersShip/FormContainerShip.cs
similarity index 100%
rename from Lab1ContainersShip/Lab1ContainersShip/Form1.cs
rename to Lab1ContainersShip/Lab1ContainersShip/FormContainerShip.cs
diff --git a/Lab1ContainersShip/Lab1ContainersShip/Form1.resx b/Lab1ContainersShip/Lab1ContainersShip/FormContainerShip.resx
similarity index 100%
rename from Lab1ContainersShip/Lab1ContainersShip/Form1.resx
rename to Lab1ContainersShip/Lab1ContainersShip/FormContainerShip.resx
diff --git a/Lab1ContainersShip/Lab1ContainersShip/Lab1ContainersShip.csproj b/Lab1ContainersShip/Lab1ContainersShip/Lab1ContainersShip.csproj
index 9456ae0..7225e59 100644
--- a/Lab1ContainersShip/Lab1ContainersShip/Lab1ContainersShip.csproj
+++ b/Lab1ContainersShip/Lab1ContainersShip/Lab1ContainersShip.csproj
@@ -47,17 +47,18 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AbstractStrategy.cs" />
+    <Compile Include="ShipGenericCollection.cs" />
     <Compile Include="Direction.cs" />
     <Compile Include="DrawingContainerShip.cs" />
     <Compile Include="DrawingShip.cs" />
     <Compile Include="DrawningObjectShip.cs" />
     <Compile Include="EntityContainerShip.cs" />
     <Compile Include="EntityShip.cs" />
-    <Compile Include="Form1.cs">
+    <Compile Include="FormContainerShip.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Form1.Designer.cs">
-      <DependentUpon>Form1.cs</DependentUpon>
+    <Compile Include="FormContainerShip.Designer.cs">
+      <DependentUpon>FormContainerShip.cs</DependentUpon>
     </Compile>
     <Compile Include="IMoveableObject.cs" />
     <Compile Include="MoveToBorder.cs" />
@@ -65,9 +66,10 @@
     <Compile Include="ObjectParameters.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SetGeneric.cs" />
     <Compile Include="Status.cs" />
-    <EmbeddedResource Include="Form1.resx">
-      <DependentUpon>Form1.cs</DependentUpon>
+    <EmbeddedResource Include="FormContainerShip.resx">
+      <DependentUpon>FormContainerShip.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
diff --git a/Lab1ContainersShip/Lab1ContainersShip/Program.cs b/Lab1ContainersShip/Lab1ContainersShip/Program.cs
index c4c1a15..e6271c4 100644
--- a/Lab1ContainersShip/Lab1ContainersShip/Program.cs
+++ b/Lab1ContainersShip/Lab1ContainersShip/Program.cs
@@ -16,7 +16,7 @@ namespace Lab1ContainersShip
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new Form1());
+            Application.Run(new FormContainerShip());
         }
     }
 }
diff --git a/Lab1ContainersShip/Lab1ContainersShip/SetGeneric.cs b/Lab1ContainersShip/Lab1ContainersShip/SetGeneric.cs
new file mode 100644
index 0000000..495a8d2
--- /dev/null
+++ b/Lab1ContainersShip/Lab1ContainersShip/SetGeneric.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Lab1ContainersShip
+{
+    internal class SetGeneric
+    {
+    }
+}
diff --git a/Lab1ContainersShip/Lab1ContainersShip/ShipCollection.resx b/Lab1ContainersShip/Lab1ContainersShip/ShipCollection.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/Lab1ContainersShip/Lab1ContainersShip/ShipCollection.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Lab1ContainersShip/Lab1ContainersShip/ShipGenericCollection.cs b/Lab1ContainersShip/Lab1ContainersShip/ShipGenericCollection.cs
new file mode 100644
index 0000000..6f54fb0
--- /dev/null
+++ b/Lab1ContainersShip/Lab1ContainersShip/ShipGenericCollection.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Lab1ContainersShip
+{
+    internal class CarsGenericCollection
+    {
+    }
+}