s434678/Czoko_Smieciarka
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drobne poprawki

Browse Source
This commit is contained in:
Bartosz Chyzy 2019-03-13 17:23:52 +01:00
parent e61eb1a87c
commit fdbc7fe058
14 changed files with 124 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Trunk/Components/CzokoŚmieciarka.DataModels/CzokoŚmieciarka.DataModels.csproj
View File

@ -33,6 +33,7 @@
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
@ -42,7 +43,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Exceptions.cs" />
<Compile Include="Interfaces\Enums\Directions.cs" />
<Compile Include="Enums\Directions.cs" />
<Compile Include="Interfaces\GarbageCollector\AGarbageCollector.cs" />
<Compile Include="Interfaces\GarbageCollector\IGarbageCollector.cs" />
<Compile Include="Interfaces\Garbage\AGarbage.cs" />

10
Trunk/Components/CzokoŚmieciarka.DataModels/Enums/Directions.cs Normal file
View File

@ -0,0 +1,10 @@
namespace CzokoŚmieciarka.DataModels.Enums
{
public enum Direction
{
Left,
Right,
Up,
Down
}
}

6
Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/Garbage/AGarbage.cs
View File

@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace CzokoŚmieciarka.DataModels.Interfaces
{
public abstract class AGarbage : IGarbage, ICloneable
public abstract class AGarbage : IGarbage
{
protected AGarbage(ITypeOfGarbage typeOfGarbage, int weight)
{
@ -15,6 +15,7 @@ namespace CzokoŚmieciarka.DataModels.Interfaces
}
public ITypeOfGarbage TypeOfGarbage { get; }
public virtual int Weight { get; set; }
public virtual int Volume
@ -23,7 +24,7 @@ namespace CzokoŚmieciarka.DataModels.Interfaces
}
protected abstract AGarbage Add(AGarbage garbageToAdd);
protected abstract AGarbage Subtract (AGarbage garbageToSubstract);
protected abstract AGarbage Subtract (AGarbage garbageToSubtract);
#region Operators
@ -36,6 +37,7 @@ namespace CzokoŚmieciarka.DataModels.Interfaces
{
return a.Subtract(b);
}
#endregion
public object Clone()

2
Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/Garbage/IGarbage.cs
View File

@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace CzokoŚmieciarka.DataModels.Interfaces
{
public interface IGarbage
public interface IGarbage : ICloneable
{
ITypeOfGarbage TypeOfGarbage { get; }

1
Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/GarbageCollector/AGarbageCollector.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using CzokoŚmieciarka.DataModels.Interfaces.TrashCans;
using CzokoŚmieciarka.DataModels.Models;
namespace CzokoŚmieciarka.DataModels.Interfaces.GarbageCollector

1
Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/GarbageCollector/IGarbageCollector.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using CzokoŚmieciarka.DataModels.Interfaces.TrashCans;
using CzokoŚmieciarka.DataModels.Models;
namespace CzokoŚmieciarka.DataModels.Interfaces

10
Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/TrashCans/ADump.cs
View File

@ -1,12 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using CzokoŚmieciarka.DataModels.Interfaces.TrashCans;
using CzokoŚmieciarka.DataModels.Models;
using CzokoŚmieciarka.DataModels.Models;
namespace CzokoŚmieciarka.DataModels.Interfaces
namespace CzokoŚmieciarka.DataModels.Interfaces.TrashCans
{
public abstract class ADump : ATrashCan
{

9
Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/TrashCans/AGarbageCollectorContainer.cs
View File

@ -1,11 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using CzokoŚmieciarka.DataModels.Interfaces.TrashCans;
namespace CzokoŚmieciarka.DataModels.Interfaces
namespace CzokoŚmieciarka.DataModels.Interfaces.TrashCans
{
public abstract class AGarbageCollectorContainer : ATrashCan
{

2
Trunk/Components/CzokoŚmieciarka.DataModels/Models/Steps/MoveStep.cs
View File

@ -3,8 +3,8 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using CzokoŚmieciarka.DataModels.Enums;
using CzokoŚmieciarka.DataModels.Interfaces;
using CzokoŚmieciarka.DataModels.Interfaces.Enums;
using CzokoŚmieciarka.DataModels.Interfaces.TrashCans;
namespace CzokoŚmieciarka.DataModels.Models.Steps

1
Trunk/Components/CzokoŚmieciarka.DataModels/Models/Steps/SpillStep.cs
View File

@ -4,6 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using CzokoŚmieciarka.DataModels.Interfaces;
using CzokoŚmieciarka.DataModels.Interfaces.TrashCans;
namespace CzokoŚmieciarka.DataModels.Models.Steps
{

6
Trunk/CzokoŚmieciarka.DataModels.GeneralModels/App.config Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
</configuration>

53
Trunk/CzokoŚmieciarka.DataModels.GeneralModels/CzokoŚmieciarka.DataModels.GeneralModels.csproj Normal file
View File

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{0A782331-4F94-407A-9655-494E8DD2604A}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>CzokoŚmieciarka.DataModels.GeneralModels</RootNamespace>
<AssemblyName>CzokoŚmieciarka.DataModels.GeneralModels</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

11
Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/Enums/Directions.cs → Trunk/CzokoŚmieciarka.DataModels.GeneralModels/Program.cs
View File

@ -4,13 +4,12 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CzokoŚmieciarka.DataModels.Interfaces.Enums
namespace CzokoŚmieciarka.DataModels.GeneralModels
{
public enum Direction
class Program
{
Left,
Right,
Up,
Down
static void Main(string[] args)
{
}
}
}

36
Trunk/CzokoŚmieciarka.DataModels.GeneralModels/Properties/AssemblyInfo.cs Normal file
View File

@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("CzokoŚmieciarka.DataModels.GeneralModels")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("CzokoŚmieciarka.DataModels.GeneralModels")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("0a782331-4f94-407a-9655-494e8dd2604a")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]