CS

2025-06-10 11:46:39 +02:00
parent 6f32a80836
commit 37013ec1fc
35 changed files with 243 additions and 27 deletions
--- a/company/.idea/indexLayout.xml
+++ b/company/.idea/indexLayout.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="UserContentModel">
-    <attachedFolders />
+    <attachedFolders>
+      <Path>../../../T2</Path>
+    </attachedFolders>
    <explicitIncludes />
    <explicitExcludes />
  </component>
--- a/company/Company.cs
+++ b/company/Company.cs
@@ -1,4 +1,5 @@
 using System.Text;
+using CS2B_shipping_company.Container;

 namespace CS2B_shipping_company;

--- a/company/Container/BaseContainer.cs
+++ b/company/Container/BaseContainer.cs
@@ -1,4 +1,4 @@
-namespace CS2B_shipping_company;
+namespace CS2B_shipping_company.Container;

 public abstract class BaseContainer
 {
--- a/company/Container/FullContainer.cs
+++ b/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
 {
--- a/company/Container/HalfContainer.cs
+++ b/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
 {
--- a/company/Container/QuarterContainer.cs
+++ b/company/Container/QuarterContainer.cs
@@ -1,4 +1,4 @@
-namespace CS2B_shipping_company;
+namespace CS2B_shipping_company.Container;

 public class QuarterContainer : BaseContainer
 {
--- a/company/Exception/InvalidInputException.cs
+++ b/company/Exception/InvalidInputException.cs
@@ -1,4 +1,4 @@
-namespace CS2B_shipping_company;
+namespace CS2B_shipping_company.Exception;

 public class InvalidInputException : ShippingException
 {
--- a/company/Exception/ShippingException.cs
+++ b/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) { }
 }
--- a/company/Exception/VolumeExceededException.cs
+++ b/company/Exception/VolumeExceededException.cs
@@ -1,4 +1,4 @@
-namespace CS2B_shipping_company;
+namespace CS2B_shipping_company.Exception;

 public class VolumeExceededException : ShippingException
 {
--- a/company/Exception/WeightExceededException.cs
+++ b/company/Exception/WeightExceededException.cs
@@ -1,4 +1,4 @@
-namespace CS2B_shipping_company;
+namespace CS2B_shipping_company.Exception;

 public class WeightExceededException : ShippingException
 {
--- a/company/Program.cs
+++ b/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);
        
--- a/company/Server.cs
+++ b/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}");
        }
--- a/company/bin/Debug/net9.0/CS2B
+++ b/company/bin/Debug/net9.0/CS2B
--- a/company/bin/Debug/net9.0/CS2B
+++ b/company/bin/Debug/net9.0/CS2B
--- a/company.csproj.nuget.dgspec.json
+++ b/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"
--- a/company.csproj.nuget.g.props
+++ b/company.csproj.nuget.g.props
@@ -7,7 +7,7 @@
    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/home/rens/.nuget/packages/</NuGetPackageRoot>
    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/home/rens/.nuget/packages/</NuGetPackageFolders>
    <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.12.2</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.13.2</NuGetToolVersion>
  </PropertyGroup>
  <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
    <SourceRoot Include="/home/rens/.nuget/packages/" />
--- a/company/obj/Debug/net9.0/CS2B
+++ b/company/obj/Debug/net9.0/CS2B
@@ -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")]
--- a/company.AssemblyInfoInputs.cache
+++ b/company.AssemblyInfoInputs.cache
@@ -1 +1 @@
-a8e586fa0f061cb0aaa5439753f525a2a3c0bf7950ed6c35dd6c9efc1c049d73
+0913bbc8f927833caed9093ecdea2f944561fbcc44cfadc86e7b4634e0bfb243
--- a/company.GeneratedMSBuildEditorConfig.editorconfig
+++ b/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
--- a/company/obj/Debug/net9.0/CS2B
+++ b/company/obj/Debug/net9.0/CS2B
--- a/company.csproj.FileListAbsolute.txt
+++ b/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
--- a/company/obj/Debug/net9.0/CS2B
+++ b/company/obj/Debug/net9.0/CS2B
--- a/company.genruntimeconfig.cache
+++ b/company.genruntimeconfig.cache
@@ -1 +1 @@
-359c231ad0ab162505dccc65a44df9ca96011831389af188175a0715d3cde94f
+6dc63fc683064ca4e993659b38ad594dac85a1a95861ff2a2c9e888850bc3c64
--- a/company/obj/Debug/net9.0/CS2B
+++ b/company/obj/Debug/net9.0/CS2B
--- a/company/obj/Debug/net9.0/ref/CS2B
+++ b/company/obj/Debug/net9.0/ref/CS2B
--- a/company/obj/Debug/net9.0/refint/CS2B
+++ b/company/obj/Debug/net9.0/refint/CS2B
--- a/company/obj/project.assets.json
+++ b/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"
--- a/company/obj/project.nuget.cache
+++ b/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": []
 }
--- a/company/obj/rider.project.model.nuget.info
+++ b/company/obj/rider.project.model.nuget.info
@@ -1 +1 @@
-17493942230565017
+17494093033930601
--- a/company/obj/rider.project.restore.info
+++ b/company/obj/rider.project.restore.info
@@ -1 +1 @@
-17493942230565017
+17495474612743232
--- a/company/ContainerApp
+++ b/company/ContainerApp