diff --git a/CS/CS2A shipping UML.zip b/CS/CS2A shipping UML.zip new file mode 100644 index 0000000..eab4b42 Binary files /dev/null and b/CS/CS2A shipping UML.zip differ diff --git a/CS/CS2A shipping UML/UML_2A_Rens_Pastoor.drawio b/CS/CS2A shipping UML/UML_2A_Rens_Pastoor.drawio new file mode 100644 index 0000000..0b7405d --- /dev/null +++ b/CS/CS2A shipping UML/UML_2A_Rens_Pastoor.drawio @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CS/CS2A shipping UML/UML_2A_Rens_Pastoor_v1.1.pdf b/CS/CS2A shipping UML/UML_2A_Rens_Pastoor_v1.1.pdf new file mode 100644 index 0000000..9318a44 Binary files /dev/null and b/CS/CS2A shipping UML/UML_2A_Rens_Pastoor_v1.1.pdf differ diff --git a/CS/CS2A shipping UML/UML_2A_Rens_Pastoor_v1.pdf b/CS/CS2A shipping UML/UML_2A_Rens_Pastoor_v1.pdf new file mode 100644 index 0000000..7b909b1 Binary files /dev/null and b/CS/CS2A shipping UML/UML_2A_Rens_Pastoor_v1.pdf differ diff --git a/CS/CS2B shipping company/.idea/.idea.CS2B shipping company/.idea/indexLayout.xml b/CS/CS2B shipping company/.idea/.idea.CS2B shipping company/.idea/indexLayout.xml index 7b08163..84e4e5d 100644 --- a/CS/CS2B shipping company/.idea/.idea.CS2B shipping company/.idea/indexLayout.xml +++ b/CS/CS2B shipping company/.idea/.idea.CS2B shipping company/.idea/indexLayout.xml @@ -1,7 +1,9 @@ - + + ../../../T2 + diff --git a/CS/CS2B shipping company/CS2B shipping company/Company.cs b/CS/CS2B shipping company/CS2B shipping company/Company.cs index fb02f3a..6c23d50 100644 --- a/CS/CS2B shipping company/CS2B shipping company/Company.cs +++ b/CS/CS2B shipping company/CS2B shipping company/Company.cs @@ -1,4 +1,5 @@ using System.Text; +using CS2B_shipping_company.Container; namespace CS2B_shipping_company; diff --git a/CS/CS2B shipping company/CS2B shipping company/Container/BaseContainer.cs b/CS/CS2B shipping company/CS2B shipping company/Container/BaseContainer.cs index b16a892..af26345 100644 --- a/CS/CS2B shipping company/CS2B shipping company/Container/BaseContainer.cs +++ b/CS/CS2B shipping company/CS2B shipping company/Container/BaseContainer.cs @@ -1,4 +1,4 @@ -namespace CS2B_shipping_company; +namespace CS2B_shipping_company.Container; public abstract class BaseContainer { diff --git a/CS/CS2B shipping company/CS2B shipping company/Container/FullContainer.cs b/CS/CS2B shipping company/CS2B shipping company/Container/FullContainer.cs index 269a866..bcbd91d 100644 --- a/CS/CS2B shipping company/CS2B shipping company/Container/FullContainer.cs +++ b/CS/CS2B shipping company/CS2B shipping company/Container/FullContainer.cs @@ -1,4 +1,6 @@ -namespace CS2B_shipping_company; +using CS2B_shipping_company.Exception; + +namespace CS2B_shipping_company.Container; public class FullContainer : BaseContainer { diff --git a/CS/CS2B shipping company/CS2B shipping company/Container/HalfContainer.cs b/CS/CS2B shipping company/CS2B shipping company/Container/HalfContainer.cs index 38cee10..e64be06 100644 --- a/CS/CS2B shipping company/CS2B shipping company/Container/HalfContainer.cs +++ b/CS/CS2B shipping company/CS2B shipping company/Container/HalfContainer.cs @@ -1,4 +1,6 @@ -namespace CS2B_shipping_company; +using CS2B_shipping_company.Exception; + +namespace CS2B_shipping_company.Container; public class HalfContainer : BaseContainer { diff --git a/CS/CS2B shipping company/CS2B shipping company/Container/QuarterContainer.cs b/CS/CS2B shipping company/CS2B shipping company/Container/QuarterContainer.cs index 8712e54..c40b13e 100644 --- a/CS/CS2B shipping company/CS2B shipping company/Container/QuarterContainer.cs +++ b/CS/CS2B shipping company/CS2B shipping company/Container/QuarterContainer.cs @@ -1,4 +1,4 @@ -namespace CS2B_shipping_company; +namespace CS2B_shipping_company.Container; public class QuarterContainer : BaseContainer { diff --git a/CS/CS2B shipping company/CS2B shipping company/Exception/InvalidInputException.cs b/CS/CS2B shipping company/CS2B shipping company/Exception/InvalidInputException.cs index 013432f..fa74595 100644 --- a/CS/CS2B shipping company/CS2B shipping company/Exception/InvalidInputException.cs +++ b/CS/CS2B shipping company/CS2B shipping company/Exception/InvalidInputException.cs @@ -1,4 +1,4 @@ -namespace CS2B_shipping_company; +namespace CS2B_shipping_company.Exception; public class InvalidInputException : ShippingException { diff --git a/CS/CS2B shipping company/CS2B shipping company/Exception/ShippingException.cs b/CS/CS2B shipping company/CS2B shipping company/Exception/ShippingException.cs index 179eecc..6ee6ce6 100644 --- a/CS/CS2B shipping company/CS2B shipping company/Exception/ShippingException.cs +++ b/CS/CS2B shipping company/CS2B shipping company/Exception/ShippingException.cs @@ -1,6 +1,6 @@ -namespace CS2B_shipping_company; +namespace CS2B_shipping_company.Exception; -public class ShippingException : Exception +public class ShippingException : System.Exception { public ShippingException(string message) : base(message) { } } \ No newline at end of file diff --git a/CS/CS2B shipping company/CS2B shipping company/Exception/VolumeExceededException.cs b/CS/CS2B shipping company/CS2B shipping company/Exception/VolumeExceededException.cs index 8d926f8..70c5aab 100644 --- a/CS/CS2B shipping company/CS2B shipping company/Exception/VolumeExceededException.cs +++ b/CS/CS2B shipping company/CS2B shipping company/Exception/VolumeExceededException.cs @@ -1,4 +1,4 @@ -namespace CS2B_shipping_company; +namespace CS2B_shipping_company.Exception; public class VolumeExceededException : ShippingException { diff --git a/CS/CS2B shipping company/CS2B shipping company/Exception/WeightExceededException.cs b/CS/CS2B shipping company/CS2B shipping company/Exception/WeightExceededException.cs index 7e5cd5e..46ec0dd 100644 --- a/CS/CS2B shipping company/CS2B shipping company/Exception/WeightExceededException.cs +++ b/CS/CS2B shipping company/CS2B shipping company/Exception/WeightExceededException.cs @@ -1,4 +1,4 @@ -namespace CS2B_shipping_company; +namespace CS2B_shipping_company.Exception; public class WeightExceededException : ShippingException { diff --git a/CS/CS2B shipping company/CS2B shipping company/Program.cs b/CS/CS2B shipping company/CS2B shipping company/Program.cs index 402e9b7..0b9f509 100644 --- a/CS/CS2B shipping company/CS2B shipping company/Program.cs +++ b/CS/CS2B shipping company/CS2B shipping company/Program.cs @@ -1,9 +1,7 @@ namespace CS2B_shipping_company; -public class Program -{ - public static async Task Main(string[] args) - { +public class Program { + public static async Task Main(string[] args){ var company = new Company(); var server = new Server(company); diff --git a/CS/CS2B shipping company/CS2B shipping company/Server.cs b/CS/CS2B shipping company/CS2B shipping company/Server.cs index 7d73faf..86e43eb 100644 --- a/CS/CS2B shipping company/CS2B shipping company/Server.cs +++ b/CS/CS2B shipping company/CS2B shipping company/Server.cs @@ -1,5 +1,7 @@ using System.Net; using System.Net.Sockets; +using CS2B_shipping_company.Container; +using CS2B_shipping_company.Exception; namespace CS2B_shipping_company; @@ -35,7 +37,7 @@ public class Server await HandleClient(reader, writer); } } - catch (Exception ex) + catch (System.Exception ex) { Console.WriteLine($"Error: {ex.Message}"); } @@ -93,7 +95,7 @@ public class Server { await writer.WriteLineAsync($"ERR;{ex.Message}"); } - catch (Exception ex) + catch (System.Exception ex) { await writer.WriteLineAsync($"ERR;{ex.Message}"); } diff --git a/CS/CS2B shipping company/CS2B shipping company/bin/Debug/net9.0/CS2B shipping company.dll b/CS/CS2B shipping company/CS2B shipping company/bin/Debug/net9.0/CS2B shipping company.dll index e77185d..b8cd510 100644 Binary files a/CS/CS2B shipping company/CS2B shipping company/bin/Debug/net9.0/CS2B shipping company.dll and b/CS/CS2B shipping company/CS2B shipping company/bin/Debug/net9.0/CS2B shipping company.dll differ diff --git a/CS/CS2B shipping company/CS2B shipping company/bin/Debug/net9.0/CS2B shipping company.pdb b/CS/CS2B shipping company/CS2B shipping company/bin/Debug/net9.0/CS2B shipping company.pdb index 4198410..38af6e8 100644 Binary files a/CS/CS2B shipping company/CS2B shipping company/bin/Debug/net9.0/CS2B shipping company.pdb and b/CS/CS2B shipping company/CS2B shipping company/bin/Debug/net9.0/CS2B shipping company.pdb differ diff --git a/CS/CS2B shipping company/CS2B shipping company/obj/CS2B shipping company.csproj.nuget.dgspec.json b/CS/CS2B shipping company/CS2B shipping company/obj/CS2B shipping company.csproj.nuget.dgspec.json index 259c322..c20be11 100644 --- a/CS/CS2B shipping company/CS2B shipping company/obj/CS2B shipping company.csproj.nuget.dgspec.json +++ b/CS/CS2B shipping company/CS2B shipping company/obj/CS2B shipping company.csproj.nuget.dgspec.json @@ -11,7 +11,7 @@ "projectName": "CS2B shipping company", "projectPath": "/home/rens/files/T2/CS/CS2B shipping company/CS2B shipping company/CS2B shipping company.csproj", "packagesPath": "/home/rens/.nuget/packages/", - "outputPath": "/home/rens/T2/CS/CS2B shipping company/CS2B shipping company/obj/", + "outputPath": "/home/rens/files/T2/CS/CS2B shipping company/CS2B shipping company/obj/", "projectStyle": "PackageReference", "configFilePaths": [ "/home/rens/.nuget/NuGet/NuGet.Config" diff --git a/CS/CS2B shipping company/CS2B shipping company/obj/CS2B shipping company.csproj.nuget.g.props b/CS/CS2B shipping company/CS2B shipping company/obj/CS2B shipping company.csproj.nuget.g.props index 1ee7f5f..adf3b82 100644 --- a/CS/CS2B shipping company/CS2B shipping company/obj/CS2B shipping company.csproj.nuget.g.props +++ b/CS/CS2B shipping company/CS2B shipping company/obj/CS2B shipping company.csproj.nuget.g.props @@ -7,7 +7,7 @@ /home/rens/.nuget/packages/ /home/rens/.nuget/packages/ PackageReference - 6.12.2 + 6.13.2 diff --git a/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.AssemblyInfo.cs b/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.AssemblyInfo.cs index 7b1fa9b..3a46bfa 100644 --- a/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.AssemblyInfo.cs +++ b/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("CS2B shipping company")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+0a53cd8bd45341b69a3feec05a574e84f196f04b")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6f32a80836dcb19b49b8bbcea88f30604e05ac14")] [assembly: System.Reflection.AssemblyProductAttribute("CS2B shipping company")] [assembly: System.Reflection.AssemblyTitleAttribute("CS2B shipping company")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.AssemblyInfoInputs.cache b/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.AssemblyInfoInputs.cache index a193c9d..32ce71d 100644 --- a/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.AssemblyInfoInputs.cache +++ b/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.AssemblyInfoInputs.cache @@ -1 +1 @@ -a8e586fa0f061cb0aaa5439753f525a2a3c0bf7950ed6c35dd6c9efc1c049d73 +0913bbc8f927833caed9093ecdea2f944561fbcc44cfadc86e7b4634e0bfb243 diff --git a/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.GeneratedMSBuildEditorConfig.editorconfig b/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.GeneratedMSBuildEditorConfig.editorconfig index e7e48e5..0fa8520 100644 --- a/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.GeneratedMSBuildEditorConfig.editorconfig +++ b/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.GeneratedMSBuildEditorConfig.editorconfig @@ -8,7 +8,7 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = CS2B_shipping_company -build_property.ProjectDir = /home/rens/T2/CS/CS2B shipping company/CS2B shipping company/ +build_property.ProjectDir = /home/rens/files/T2/CS/CS2B shipping company/CS2B shipping company/ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.EffectiveAnalysisLevelStyle = 9.0 diff --git a/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.assets.cache b/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.assets.cache index 5c45277..fbe37b3 100644 Binary files a/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.assets.cache and b/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.assets.cache differ diff --git a/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.csproj.FileListAbsolute.txt b/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.csproj.FileListAbsolute.txt index d1805d3..f68006e 100644 --- a/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.csproj.FileListAbsolute.txt +++ b/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.csproj.FileListAbsolute.txt @@ -8,3 +8,7 @@ /home/rens/files/T2/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.dll /home/rens/files/T2/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/refint/CS2B shipping company.dll /home/rens/files/T2/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.pdb +/home/rens/files/T2/CS/CS2B shipping company/CS2B shipping company/bin/Debug/net9.0/CS2B shipping company.deps.json +/home/rens/files/T2/CS/CS2B shipping company/CS2B shipping company/bin/Debug/net9.0/CS2B shipping company.runtimeconfig.json +/home/rens/files/T2/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.genruntimeconfig.cache +/home/rens/files/T2/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/ref/CS2B shipping company.dll diff --git a/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.dll b/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.dll index e77185d..b8cd510 100644 Binary files a/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.dll and b/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.dll differ diff --git a/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.genruntimeconfig.cache b/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.genruntimeconfig.cache index 50600ac..a64ca3d 100644 --- a/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.genruntimeconfig.cache +++ b/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.genruntimeconfig.cache @@ -1 +1 @@ -359c231ad0ab162505dccc65a44df9ca96011831389af188175a0715d3cde94f +6dc63fc683064ca4e993659b38ad594dac85a1a95861ff2a2c9e888850bc3c64 diff --git a/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.pdb b/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.pdb index 4198410..38af6e8 100644 Binary files a/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.pdb and b/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/CS2B shipping company.pdb differ diff --git a/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/ref/CS2B shipping company.dll b/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/ref/CS2B shipping company.dll index 618bad2..be9f5b4 100644 Binary files a/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/ref/CS2B shipping company.dll and b/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/ref/CS2B shipping company.dll differ diff --git a/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/refint/CS2B shipping company.dll b/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/refint/CS2B shipping company.dll index 618bad2..be9f5b4 100644 Binary files a/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/refint/CS2B shipping company.dll and b/CS/CS2B shipping company/CS2B shipping company/obj/Debug/net9.0/refint/CS2B shipping company.dll differ diff --git a/CS/CS2B shipping company/CS2B shipping company/obj/project.assets.json b/CS/CS2B shipping company/CS2B shipping company/obj/project.assets.json index 722be29..acb6525 100644 --- a/CS/CS2B shipping company/CS2B shipping company/obj/project.assets.json +++ b/CS/CS2B shipping company/CS2B shipping company/obj/project.assets.json @@ -17,7 +17,7 @@ "projectName": "CS2B shipping company", "projectPath": "/home/rens/files/T2/CS/CS2B shipping company/CS2B shipping company/CS2B shipping company.csproj", "packagesPath": "/home/rens/.nuget/packages/", - "outputPath": "/home/rens/T2/CS/CS2B shipping company/CS2B shipping company/obj/", + "outputPath": "/home/rens/files/T2/CS/CS2B shipping company/CS2B shipping company/obj/", "projectStyle": "PackageReference", "configFilePaths": [ "/home/rens/.nuget/NuGet/NuGet.Config" diff --git a/CS/CS2B shipping company/CS2B shipping company/obj/project.nuget.cache b/CS/CS2B shipping company/CS2B shipping company/obj/project.nuget.cache index 9d7f0c3..63f7e4e 100644 --- a/CS/CS2B shipping company/CS2B shipping company/obj/project.nuget.cache +++ b/CS/CS2B shipping company/CS2B shipping company/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "7g+wE+CVdHE=", + "dgSpecHash": "rp3IcKxAp1s=", "success": true, - "projectFilePath": "/home/rens/T2/CS/CS2B shipping company/CS2B shipping company/CS2B shipping company.csproj", + "projectFilePath": "/home/rens/files/T2/CS/CS2B shipping company/CS2B shipping company/CS2B shipping company.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file diff --git a/CS/CS2B shipping company/CS2B shipping company/obj/rider.project.model.nuget.info b/CS/CS2B shipping company/CS2B shipping company/obj/rider.project.model.nuget.info index e03e5fd..2af156c 100644 --- a/CS/CS2B shipping company/CS2B shipping company/obj/rider.project.model.nuget.info +++ b/CS/CS2B shipping company/CS2B shipping company/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17493942230565017 \ No newline at end of file +17494093033930601 \ No newline at end of file diff --git a/CS/CS2B shipping company/CS2B shipping company/obj/rider.project.restore.info b/CS/CS2B shipping company/CS2B shipping company/obj/rider.project.restore.info index e03e5fd..3a68ec3 100644 --- a/CS/CS2B shipping company/CS2B shipping company/obj/rider.project.restore.info +++ b/CS/CS2B shipping company/CS2B shipping company/obj/rider.project.restore.info @@ -1 +1 @@ -17493942230565017 \ No newline at end of file +17495474612743232 \ No newline at end of file diff --git a/CS/ContainerApp - Gijs van Maanen.zip b/CS/CS2B shipping company/ContainerApp - Gijs van Maanen.zip similarity index 100% rename from CS/ContainerApp - Gijs van Maanen.zip rename to CS/CS2B shipping company/ContainerApp - Gijs van Maanen.zip