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
/// Высота объекта
///
public int GetHeight => _shipHeight;
+ ///
+ /// Получение объекта IMoveableObject из объекта DrawningCar
+ ///
+ 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 @@
+
-
+
Form
-
- Form1.cs
+
+ FormContainerShip.cs
@@ -65,9 +66,10 @@
+
-
- Form1.cs
+
+ FormContainerShip.cs
ResXFileCodeGenerator
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ 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
+ {
+ }
+}