[psycho commit] r428 - in trunk/Psycho: . src/Libraries/Teddy/Sample src/Libraries/Teddy/Teddy.Core src/Libraries...

[codesite...@google.com]

Author: p.zurek
Date: Fri Sep 5 00:21:36 2008
New Revision: 428

Removed:
trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.Layer/ILayer.cs

trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.Layer/ILayerList.cs
trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.Layer/Layer.cs
trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.Layer/LayerList.cs
Modified:
trunk/Psycho/Psycho.sln
trunk/Psycho/src/Libraries/Teddy/Sample/Sample.csproj
trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.Canvas/Canvas.cs
trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.Canvas/ICanvas.cs
trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.Shape/IShape.cs
trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.Shape/Shape.cs
trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.csproj

Log:
Removing Layer class and interfaces


Modified: trunk/Psycho/Psycho.sln
==============================================================================
--- trunk/Psycho/Psycho.sln (original)
+++ trunk/Psycho/Psycho.sln Fri Sep 5 00:21:36 2008
@@ -29,40 +29,40 @@
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {49875DE6-9539-4B4F-B38F-AB262F8935B5}.Debug|Any CPU.ActiveCfg = Debug|
Any CPU
- {49875DE6-9539-4B4F-B38F-AB262F8935B5}.Debug|Any CPU.Build.0 = Debug|Any
CPU
- {49875DE6-9539-4B4F-B38F-AB262F8935B5}.Release|Any CPU.ActiveCfg =
Release|Any CPU
- {49875DE6-9539-4B4F-B38F-AB262F8935B5}.Release|Any CPU.Build.0 = Release|
Any CPU
{1F53D429-A4FF-4BA6-AA63-6AD2C030F198}.Debug|Any CPU.ActiveCfg = Debug|
Any CPU
{1F53D429-A4FF-4BA6-AA63-6AD2C030F198}.Debug|Any CPU.Build.0 = Debug|Any
CPU
{1F53D429-A4FF-4BA6-AA63-6AD2C030F198}.Release|Any CPU.ActiveCfg =
Release|Any CPU
{1F53D429-A4FF-4BA6-AA63-6AD2C030F198}.Release|Any CPU.Build.0 = Release|
Any CPU
- {68B9B57D-18A3-4814-BE57-AB8871B9137B}.Debug|Any CPU.ActiveCfg = Debug|
Any CPU
- {68B9B57D-18A3-4814-BE57-AB8871B9137B}.Debug|Any CPU.Build.0 = Debug|Any
CPU
- {68B9B57D-18A3-4814-BE57-AB8871B9137B}.Release|Any CPU.ActiveCfg =
Release|Any CPU
- {68B9B57D-18A3-4814-BE57-AB8871B9137B}.Release|Any CPU.Build.0 = Release|
Any CPU
- {26E0D481-5056-4E4A-B1A8-F4184755695E}.Debug|Any CPU.ActiveCfg = Debug|
Any CPU
- {26E0D481-5056-4E4A-B1A8-F4184755695E}.Debug|Any CPU.Build.0 = Debug|Any
CPU
- {26E0D481-5056-4E4A-B1A8-F4184755695E}.Release|Any CPU.ActiveCfg =
Release|Any CPU
- {26E0D481-5056-4E4A-B1A8-F4184755695E}.Release|Any CPU.Build.0 = Release|
Any CPU
{256704C1-C489-4A6A-9931-332B0EBA4254}.Debug|Any CPU.ActiveCfg = Debug|
Any CPU
{256704C1-C489-4A6A-9931-332B0EBA4254}.Debug|Any CPU.Build.0 = Debug|Any
CPU
{256704C1-C489-4A6A-9931-332B0EBA4254}.Release|Any CPU.ActiveCfg =
Release|Any CPU
{256704C1-C489-4A6A-9931-332B0EBA4254}.Release|Any CPU.Build.0 = Release|
Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
+ {26E0D481-5056-4E4A-B1A8-F4184755695E}.Debug|Any CPU.ActiveCfg = Debug|
Any CPU
+ {26E0D481-5056-4E4A-B1A8-F4184755695E}.Debug|Any CPU.Build.0 = Debug|Any
CPU
+ {26E0D481-5056-4E4A-B1A8-F4184755695E}.Release|Any CPU.ActiveCfg =
Release|Any CPU
+ {26E0D481-5056-4E4A-B1A8-F4184755695E}.Release|Any CPU.Build.0 = Release|
Any CPU
+ {49875DE6-9539-4B4F-B38F-AB262F8935B5}.Debug|Any CPU.ActiveCfg = Debug|
Any CPU
+ {49875DE6-9539-4B4F-B38F-AB262F8935B5}.Debug|Any CPU.Build.0 = Debug|Any
CPU
+ {49875DE6-9539-4B4F-B38F-AB262F8935B5}.Release|Any CPU.ActiveCfg =
Release|Any CPU
+ {49875DE6-9539-4B4F-B38F-AB262F8935B5}.Release|Any CPU.Build.0 = Release|
Any CPU
+ {68B9B57D-18A3-4814-BE57-AB8871B9137B}.Debug|Any CPU.ActiveCfg = Debug|
Any CPU
+ {68B9B57D-18A3-4814-BE57-AB8871B9137B}.Debug|Any CPU.Build.0 = Debug|Any
CPU
+ {68B9B57D-18A3-4814-BE57-AB8871B9137B}.Release|Any CPU.ActiveCfg =
Release|Any CPU
+ {68B9B57D-18A3-4814-BE57-AB8871B9137B}.Release|Any CPU.Build.0 = Release|
Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {F0813386-967A-4DBA-8709-E8AE14700C58} =
{7A5E2F8C-9A9E-4C83-9854-F2113F5FDA1F}
- {CA04E77D-E974-4A05-ABC6-659AF407D329} =
{7A5E2F8C-9A9E-4C83-9854-F2113F5FDA1F}
- {685A55B8-2666-45F6-974C-AFA9C7AB1590} =
{7A5E2F8C-9A9E-4C83-9854-F2113F5FDA1F}
{49875DE6-9539-4B4F-B38F-AB262F8935B5} =
{F0813386-967A-4DBA-8709-E8AE14700C58}
- {A8949A45-5AD5-42D8-BE41-F13794853BFB} =
{CA04E77D-E974-4A05-ABC6-659AF407D329}
- {60D6C9B9-07B2-4D2D-97BA-C960F0652C4A} =
{CA04E77D-E974-4A05-ABC6-659AF407D329}
{1F53D429-A4FF-4BA6-AA63-6AD2C030F198} =
{A8949A45-5AD5-42D8-BE41-F13794853BFB}
{68B9B57D-18A3-4814-BE57-AB8871B9137B} =
{A8949A45-5AD5-42D8-BE41-F13794853BFB}
{26E0D481-5056-4E4A-B1A8-F4184755695E} =
{60D6C9B9-07B2-4D2D-97BA-C960F0652C4A}
{256704C1-C489-4A6A-9931-332B0EBA4254} =
{60D6C9B9-07B2-4D2D-97BA-C960F0652C4A}
+ {A8949A45-5AD5-42D8-BE41-F13794853BFB} =
{CA04E77D-E974-4A05-ABC6-659AF407D329}
+ {60D6C9B9-07B2-4D2D-97BA-C960F0652C4A} =
{CA04E77D-E974-4A05-ABC6-659AF407D329}
+ {F0813386-967A-4DBA-8709-E8AE14700C58} =
{7A5E2F8C-9A9E-4C83-9854-F2113F5FDA1F}
+ {CA04E77D-E974-4A05-ABC6-659AF407D329} =
{7A5E2F8C-9A9E-4C83-9854-F2113F5FDA1F}
+ {685A55B8-2666-45F6-974C-AFA9C7AB1590} =
{7A5E2F8C-9A9E-4C83-9854-F2113F5FDA1F}
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

Modified: trunk/Psycho/src/Libraries/Teddy/Sample/Sample.csproj
==============================================================================
--- trunk/Psycho/src/Libraries/Teddy/Sample/Sample.csproj (original)
+++ trunk/Psycho/src/Libraries/Teddy/Sample/Sample.csproj Fri Sep 5
00:21:36 2008
@@ -57,4 +57,4 @@
<Compile Include="MainWindow.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
-</Project>
+</Project>
\ No newline at end of file

Modified:
trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.Canvas/Canvas.cs
==============================================================================
--- trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.Canvas/Canvas.cs
(original)
+++ trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.Canvas/Canvas.cs
Fri Sep 5 00:21:36 2008
@@ -22,9 +22,10 @@
using System.Collections;
using System.Collections.Generic;

-using Cairo;
using Gtk;
-
using Teddy.Core;
+using Cairo;
+
+using Teddy.Core;

namespace Teddy.Core
{
@@ -34,7 +35,6 @@
double height;
bool isDirty;
IShapeList<IShape> shapes;
- ILayerList<ILayer> layers;
IShapeList<IShape> selection;

public double Width {
@@ -81,15 +81,6 @@
selection = value;
}
}
-
- public ILayerList<ILayer> Layers {
- get {
- return layers;
- }
- set {
- layers = value;
- }
- }

public Canvas()
{
@@ -111,7 +102,7 @@
foreach (IShape shape in Selection)
if (Shapes.Contains(shape))
Shapes.Remove(shape);
- }

+ }

public void ClearSelection ()
{
@@ -120,13 +111,13 @@

public IShape GetShapeAt (double x, double y)
{
- throw new NotImplementedException();
- }
+ throw new NotImplementedException();
+ }

- public IList<IShape> GetShapesAt (double x, double y,
- double width, double height)
+ public IList<IShape> GetShapesAt (double x, double y,
+ double width, double height)
{
throw new NotImplementedException();
}
}
-}

+}
\ No newline at end of file

Modified:
trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.Canvas/ICanvas.cs
==============================================================================
---
trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.Canvas/ICanvas.cs
(original)
+++
trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.Canvas/ICanvas.cs
Fri Sep 5 00:21:36 2008
@@ -32,7 +32,6 @@
bool IsDirty { get; set; }
IShapeList<IShape> Shapes { get; set; }
IShapeList<IShape> Selection { get; set; }
- ILayerList<ILayer> Layers { get; set; }
void AddShape(IShape new_shape);
void MoveSelectedShapes (double x, double y);
void DeleteSelectedShapes();

Modified:
trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.Shape/IShape.cs
==============================================================================
--- trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.Shape/IShape.cs
(original)
+++ trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.Shape/IShape.cs
Fri Sep 5 00:21:36 2008
@@ -29,6 +29,5 @@
{
public interface IShape : IDrawable
{
- ILayer Layer { get; set; }
}
}

Modified:
trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.Shape/Shape.cs
==============================================================================
--- trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.Shape/Shape.cs
(original)
+++ trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.Shape/Shape.cs
Fri Sep 5 00:21:36 2008
@@ -24,21 +24,6 @@
{
public class Shape : IShape
{
- ILayer layer;
-
- public ILayer Layer {
- get {
- return layer;
- }
- set {
- layer = value;
- }
- }
-
- public Shape()
- {
- }
-
public void Draw()
{
}

Modified: trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.csproj
==============================================================================
--- trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.csproj (original)
+++ trunk/Psycho/src/Libraries/Teddy/Teddy.Core/Teddy.Core.csproj Fri Sep
5 00:21:36 2008
@@ -60,11 +60,7 @@
<Compile Include="Teddy.Core\IColor.cs" />
<Compile Include="Teddy.Core\IDash.cs" />
<Compile Include="Teddy.Core.Shape\Fill.cs" />
- <Compile Include="Teddy.Core.Layer\ILayer.cs" />
- <Compile Include="Teddy.Core.Layer\Layer.cs" />
<Compile Include="Teddy.Core.Shape\IDrawable.cs" />
- <Compile Include="Teddy.Core.Layer\LayerList.cs" />
- <Compile Include="Teddy.Core.Layer\ILayerList.cs" />
<Compile Include="Teddy.Core.Shape\ShapeList.cs" />
<Compile Include="Teddy.Core.Shape\IShapeList.cs" />
</ItemGroup>