Menu
▾
▴
[freetrain-svn] SF.net SVN: freetrain: [246] branches/FreeTrainSDL
|
From: <je...@us...> - 2008-03-19 22:24:35
|
Revision: 246
http://freetrain.svn.sourceforge.net/freetrain/?rev=246&view=rev
Author: jendave
Date: 2008-03-19 15:24:35 -0700 (Wed, 19 Mar 2008)
Log Message:
-----------
More namespace fixes
Modified Paths:
--------------
branches/FreeTrainSDL/FreeTrainSDL.csproj
branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs
branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureController.cs
branches/FreeTrainSDL/core/contributions/common/IEntityBuilder.cs
branches/FreeTrainSDL/core/contributions/common/PictureContribution.cs
branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs
branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs
branches/FreeTrainSDL/core/contributions/land/DefaultControllerImpl.cs
branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs
branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs
branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs
branches/FreeTrainSDL/core/contributions/population/BasePopulation.cs
branches/FreeTrainSDL/core/contributions/rail/RailAccessoryContribution.cs
branches/FreeTrainSDL/core/contributions/road/A3RoadContribution.cs
branches/FreeTrainSDL/core/contributions/road/AbstractRoadContributionImpl.cs
branches/FreeTrainSDL/core/contributions/road/RoadContribution.cs
branches/FreeTrainSDL/core/contributions/road/StandardRoadContribution.cs
branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs
branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/TrainContribution.cs
branches/FreeTrainSDL/core/controllers/AbstractLineController.cs
branches/FreeTrainSDL/core/controllers/land/BulldozeController.cs
branches/FreeTrainSDL/core/controllers/land/LandController.cs
branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs
branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs
branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs
branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs
branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs
branches/FreeTrainSDL/core/controllers/road/RoadController.cs
branches/FreeTrainSDL/core/controllers/structs/FixedSizeStructController.cs
branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs
branches/FreeTrainSDL/core/controllers/structs/VarHeightBuildingController.cs
branches/FreeTrainSDL/core/framework/MainWindow.cs
branches/FreeTrainSDL/core/framework/ResourceUtil.cs
branches/FreeTrainSDL/core/framework/Splash.cs
branches/FreeTrainSDL/core/framework/graphics/AlphaBlendSpriteSet.cs
branches/FreeTrainSDL/core/framework/graphics/ColorLibrary.cs
branches/FreeTrainSDL/core/framework/graphics/ColorMap.cs
branches/FreeTrainSDL/core/framework/graphics/ColorMappedSprite.cs
branches/FreeTrainSDL/core/framework/graphics/DefaultSpriteLoaderContributionImpl.cs
branches/FreeTrainSDL/core/framework/graphics/DirectSprite.cs
branches/FreeTrainSDL/core/framework/graphics/DirtyRect.cs
branches/FreeTrainSDL/core/framework/graphics/GraphicsException.cs
branches/FreeTrainSDL/core/framework/graphics/HueTransformSprite.cs
branches/FreeTrainSDL/core/framework/graphics/NullSprite.cs
branches/FreeTrainSDL/core/framework/graphics/Picture.cs
branches/FreeTrainSDL/core/framework/graphics/PictureManager.cs
branches/FreeTrainSDL/core/framework/graphics/PreviewDrawer.cs
branches/FreeTrainSDL/core/framework/graphics/SimpleSprite.cs
branches/FreeTrainSDL/core/framework/graphics/Sprite.cs
branches/FreeTrainSDL/core/framework/graphics/SpriteFactory.cs
branches/FreeTrainSDL/core/framework/graphics/SpriteFactoryContribution.cs
branches/FreeTrainSDL/core/framework/graphics/SpriteLoaderContribution.cs
branches/FreeTrainSDL/core/framework/graphics/SurfaceLoaders.cs
branches/FreeTrainSDL/core/framework/plugin/Contribution.cs
branches/FreeTrainSDL/core/framework/plugin/Plugin.cs
branches/FreeTrainSDL/core/framework/plugin/PluginManager.cs
branches/FreeTrainSDL/core/framework/plugin/PluginUtil.cs
branches/FreeTrainSDL/core/views/GlobalViewOptions.cs
branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs
branches/FreeTrainSDL/core/views/WeatherOverlayImpl.cs
branches/FreeTrainSDL/core/views/WeatherOverlaySpriteSet.cs
branches/FreeTrainSDL/core/views/map/MapView.cs
branches/FreeTrainSDL/core/world/Clock.cs
branches/FreeTrainSDL/core/world/RRCrossing.cs
branches/FreeTrainSDL/core/world/Traffic.cs
branches/FreeTrainSDL/core/world/Voxel.cs
branches/FreeTrainSDL/core/world/World.cs
branches/FreeTrainSDL/core/world/development/LandValue.cs
branches/FreeTrainSDL/core/world/land/LandPropertyVoxel.cs
branches/FreeTrainSDL/core/world/rail/BridgePierVoxel.cs
branches/FreeTrainSDL/core/world/rail/BridgeRail.cs
branches/FreeTrainSDL/core/world/rail/FatPlatform.cs
branches/FreeTrainSDL/core/world/rail/PassagewayRail.cs
branches/FreeTrainSDL/core/world/rail/RailPattern.cs
branches/FreeTrainSDL/core/world/rail/SlopeRailRoad.cs
branches/FreeTrainSDL/core/world/rail/StealSupportedRailContributionImpl.cs
branches/FreeTrainSDL/core/world/rail/ThinPlatform.cs
branches/FreeTrainSDL/core/world/rail/Train.cs
branches/FreeTrainSDL/core/world/rail/TunnelRail.cs
branches/FreeTrainSDL/core/world/road/Bus.cs
branches/FreeTrainSDL/core/world/road/Road.cs
branches/FreeTrainSDL/core/world/road/RoadPattern.cs
branches/FreeTrainSDL/core/world/road/RoadStyle.cs
branches/FreeTrainSDL/core/world/structs/ConstructionSite.cs
branches/FreeTrainSDL/core/world/structs/PThreeDimStructure.cs
branches/FreeTrainSDL/core/world/structs/VarHeightBuilding.cs
branches/FreeTrainSDL/core/world/terrain/MountainVoxel.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/plugin.xml
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/ControllerForm.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/ControllerImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/DummyCar.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/DummyCarContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/MenuContributionImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/ControllerForm.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/ControllerImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/MenuContributionImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/RoadAccessory.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/RoadAccessoryContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/GenericLandContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/GenericStructureContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MultiSelectorController.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/ControllerForm.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HVControllerImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HVStructure.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HalfVoxelContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HueShiftSprite.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/VinylHouseBuilder.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorConfigCommand.cs
branches/FreeTrainSDL/plugins/system/plugin.xml
Modified: branches/FreeTrainSDL/FreeTrainSDL.csproj
===================================================================
--- branches/FreeTrainSDL/FreeTrainSDL.csproj 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/FreeTrainSDL.csproj 2008-03-19 22:24:35 UTC (rev 246)
@@ -86,6 +86,7 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
+ <None Include="ClassDiagram1.cd" />
<None Include="FreeTrainSdl.snk" />
</ItemGroup>
<ItemGroup>
Modified: branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Drawing;
using System.Xml;
using FreeTrain.Util;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Controllers;
using FreeTrain.world;
Modified: branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureController.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureController.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureController.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Windows.Forms;
using FreeTrain.Controllers;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Views;
using FreeTrain.world;
using FreeTrain.world.Structs;
Modified: branches/FreeTrainSDL/core/contributions/common/IEntityBuilder.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/IEntityBuilder.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/common/IEntityBuilder.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -20,7 +20,7 @@
using System;
using System.Drawing;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Controllers;
using FreeTrain.Contributions.Population;
Modified: branches/FreeTrainSDL/core/contributions/common/PictureContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/PictureContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/common/PictureContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -21,7 +21,7 @@
using System;
using System.Xml;
using FreeTrain.Framework.plugin;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.Contributions.Common
{
Modified: branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -26,7 +26,7 @@
using FreeTrain.Contributions.Population;
using FreeTrain.Controllers;
using FreeTrain.Framework.plugin;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.world;
using FreeTrain.world.Structs;
using SDL.net;
@@ -232,7 +232,7 @@
/// </summary>
/// <param name="pixelSize"></param>
/// <returns></returns>
- public virtual FreeTrain.Framework.graphics.PreviewDrawer createPreview(System.Drawing.Size pixelSize)
+ public virtual FreeTrain.Framework.Graphics.PreviewDrawer createPreview(System.Drawing.Size pixelSize)
{
throw new NotImplementedException();
}
Modified: branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -24,7 +24,7 @@
using System.Xml;
using SDL.net;
using FreeTrain.Controllers;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Framework;
using FreeTrain.Views;
Modified: branches/FreeTrainSDL/core/contributions/land/DefaultControllerImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/DefaultControllerImpl.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/land/DefaultControllerImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -21,7 +21,7 @@
using System;
using System.Drawing;
using System.Windows.Forms;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Views;
using FreeTrain.Controllers;
using FreeTrain.world;
Modified: branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -28,7 +28,7 @@
using FreeTrain.Contributions.Common;
using FreeTrain.Controllers;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
namespace FreeTrain.Contributions.Land
Modified: branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -25,7 +25,7 @@
using SDL.net;
using FreeTrain.Controllers;
using FreeTrain.Framework.plugin;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Views;
using FreeTrain.world;
using FreeTrain.world.Land;
Modified: branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -25,7 +25,7 @@
using SDL.net;
using FreeTrain.Controllers;
using FreeTrain.Contributions.Population;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Views;
using FreeTrain.world;
Modified: branches/FreeTrainSDL/core/contributions/population/BasePopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/BasePopulation.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/population/BasePopulation.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -21,7 +21,7 @@
using System;
using System.Runtime.Serialization;
using System.Xml;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
using FreeTrain.world;
using FreeTrain.world.Structs;
Modified: branches/FreeTrainSDL/core/contributions/rail/RailAccessoryContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/rail/RailAccessoryContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/rail/RailAccessoryContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Drawing;
using FreeTrain.Contributions.Common;
using FreeTrain.Framework.plugin;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Controllers;
using FreeTrain.Contributions.Population;
@@ -80,7 +80,7 @@
/// </summary>
/// <param name="pixelSize"></param>
/// <returns></returns>
- public abstract FreeTrain.Framework.graphics.PreviewDrawer createPreview(System.Drawing.Size pixelSize);
+ public abstract FreeTrain.Framework.Graphics.PreviewDrawer createPreview(System.Drawing.Size pixelSize);
/// <summary>
///
/// </summary>
Modified: branches/FreeTrainSDL/core/contributions/road/A3RoadContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/road/A3RoadContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/road/A3RoadContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -21,8 +21,8 @@
using System;
using System.Drawing;
using System.Xml;
-using FreeTrain.Framework.graphics;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Graphics;
+using FreeTrain.Framework.Plugin;
namespace FreeTrain.Contributions.Road
{
Modified: branches/FreeTrainSDL/core/contributions/road/AbstractRoadContributionImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/road/AbstractRoadContributionImpl.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/road/AbstractRoadContributionImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,10 +23,10 @@
using System.Drawing;
using System.Xml;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Graphics;
+using FreeTrain.Framework.Plugin;
using FreeTrain.world;
-using FreeTrain.world.road;
+using FreeTrain.world.Road;
namespace FreeTrain.Contributions.Road
{
@@ -103,7 +103,7 @@
Location here = from;
while (true)
{
- Road r = Road.get(here);
+ BaseRoad r = BaseRoad.get(here);
if (r == null)
{
RoadPattern p = RoadPattern.getStraight(d);
@@ -126,7 +126,7 @@
/// <summary>
/// Creates a new road with a given pattern.
/// </summary>
- protected virtual Road create(TrafficVoxel voxel, RoadPattern pattern)
+ protected virtual BaseRoad create(TrafficVoxel voxel, RoadPattern pattern)
{
return new RoadImpl(this, voxel, pattern);
}
@@ -144,7 +144,7 @@
while (true)
{
- Road r = Road.get(here);
+ BaseRoad r = BaseRoad.get(here);
if (r != null)
r.detach(d, d.opposite);
@@ -212,7 +212,7 @@
/// Road implementation
/// </summary>
[Serializable]
- internal class RoadImpl : Road
+ internal class RoadImpl : BaseRoad
{
/// <summary>
///
Modified: branches/FreeTrainSDL/core/contributions/road/RoadContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/road/RoadContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/road/RoadContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,11 +23,11 @@
using System.Drawing;
using System.Xml;
using FreeTrain.Contributions.Common;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.world;
-using FreeTrain.world.road;
+using FreeTrain.world.Road;
-namespace FreeTrain.Contributions.road
+namespace FreeTrain.Contributions.Road
{
/// <summary>
/// Road for cars/buses
Modified: branches/FreeTrainSDL/core/contributions/road/StandardRoadContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/road/StandardRoadContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/road/StandardRoadContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,12 +23,12 @@
using System.Drawing;
using System.Xml;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.world;
-using FreeTrain.world.road;
+using FreeTrain.world.Road;
-namespace FreeTrain.Contributions.road
+namespace FreeTrain.Contributions.Road
{
/// <summary>
/// RoadContribution implemented by 15 sprites.
Modified: branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -26,7 +26,7 @@
using FreeTrain.Util;
using FreeTrain.Controllers;
using FreeTrain.Contributions.Common;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.world;
using FreeTrain.world.Structs;
Modified: branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Xml;
using FreeTrain.Framework;
using FreeTrain.Framework.plugin;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.world;
using SDL.net;
Modified: branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Xml;
using FreeTrain.Contributions.Common;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.world;
using SDL.net;
Modified: branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -22,7 +22,7 @@
using System.Drawing;
using System.Xml;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.world;
using SDL.net;
Modified: branches/FreeTrainSDL/core/contributions/train/TrainContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/TrainContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/train/TrainContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -22,7 +22,7 @@
using System.Drawing;
using System.Xml;
using FreeTrain.Framework.plugin;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.world;
using FreeTrain.world.Rail;
Modified: branches/FreeTrainSDL/core/controllers/AbstractLineController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/AbstractLineController.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/controllers/AbstractLineController.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -26,7 +26,7 @@
using System.Windows.Forms;
using FreeTrain.Contributions.Common;
using FreeTrain.Contributions.Rail;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
using FreeTrain.Views;
using FreeTrain.Views.Map;
using FreeTrain.world;
Modified: branches/FreeTrainSDL/core/controllers/land/BulldozeController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/land/BulldozeController.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/controllers/land/BulldozeController.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -32,7 +32,7 @@
using FreeTrain.world;
using FreeTrain.world.Terrain;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Util;
using SDL.net;
Modified: branches/FreeTrainSDL/core/controllers/land/LandController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/land/LandController.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/controllers/land/LandController.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -32,7 +32,7 @@
using FreeTrain.world;
using FreeTrain.world.Terrain;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Util;
using SDL.net;
Modified: branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -30,7 +30,7 @@
using FreeTrain.world.Accounting;
using FreeTrain.world.Land;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Util;
using SDL.net;
Modified: branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -26,8 +26,8 @@
using FreeTrain.Contributions.Common;
using FreeTrain.Contributions.Rail;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Graphics;
+using FreeTrain.Framework.Plugin;
using FreeTrain.Util;
using FreeTrain.world;
using FreeTrain.world.Rail;
Modified: branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -25,7 +25,7 @@
using System.ComponentModel;
using System.Windows.Forms;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Util;
using FreeTrain.world;
using FreeTrain.world.Rail;
Modified: branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -24,7 +24,7 @@
using System.ComponentModel;
using System.Windows.Forms;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Util;
using FreeTrain.world;
using FreeTrain.world.Rail;
Modified: branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -25,7 +25,7 @@
using System.Windows.Forms;
using FreeTrain.Contributions.Train;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Views;
using FreeTrain.world.Accounting;
Modified: branches/FreeTrainSDL/core/controllers/road/RoadController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/road/RoadController.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/controllers/road/RoadController.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -26,10 +26,10 @@
using System.Windows.Forms;
using FreeTrain.Contributions.Road;
using FreeTrain.Framework;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
using FreeTrain.Views.Map;
using FreeTrain.world;
-using FreeTrain.world.road;
+using FreeTrain.world.Road;
using FreeTrain.Contributions.Common;
namespace FreeTrain.Controllers.Road
Modified: branches/FreeTrainSDL/core/controllers/structs/FixedSizeStructController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/structs/FixedSizeStructController.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/controllers/structs/FixedSizeStructController.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -25,7 +25,7 @@
using System.Windows.Forms;
using FreeTrain.Contributions.Common;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Views.Map;
using FreeTrain.world;
Modified: branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -31,7 +31,7 @@
using FreeTrain.world.Structs;
using FreeTrain.Contributions.Rail;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Util;
using SDL.net;
Modified: branches/FreeTrainSDL/core/controllers/structs/VarHeightBuildingController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/structs/VarHeightBuildingController.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/controllers/structs/VarHeightBuildingController.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -29,7 +29,7 @@
using FreeTrain.world;
using FreeTrain.world.Structs;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Util;
using SDL.net;
Modified: branches/FreeTrainSDL/core/framework/MainWindow.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/MainWindow.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/MainWindow.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -32,7 +32,7 @@
//using freetrain.contributions.dock;
using FreeTrain.Contributions.Common;
using FreeTrain.Contributions.Rail;
-using FreeTrain.Contributions.road;
+using FreeTrain.Contributions.Road;
using FreeTrain.Contributions.Structs;
using FreeTrain.Contributions.Others;
using FreeTrain.Controls;
@@ -44,7 +44,7 @@
using FreeTrain.Controllers.Structs;
using FreeTrain.Framework.plugin;
using FreeTrain.Framework.Sound;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Views;
using FreeTrain.Views.Map;
using FreeTrain.world;
Modified: branches/FreeTrainSDL/core/framework/ResourceUtil.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/ResourceUtil.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/ResourceUtil.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -27,7 +27,7 @@
using SDL.net;
using SdlDotNet.Audio;
using FreeTrain.Util;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.world;
namespace FreeTrain.Framework
Modified: branches/FreeTrainSDL/core/framework/Splash.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/Splash.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/Splash.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -51,7 +51,7 @@
Application.DoEvents();
if (progress > 0.4 && exflag)
{
- Graphics g = pictureBox1.CreateGraphics();
+ System.Drawing.Graphics g = pictureBox1.CreateGraphics();
imageList.Draw(g, 232, 128, 0);
exflag = false;
}
Modified: branches/FreeTrainSDL/core/framework/graphics/AlphaBlendSpriteSet.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/AlphaBlendSpriteSet.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/AlphaBlendSpriteSet.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -24,7 +24,7 @@
using FreeTrain.world;
using SDL.net;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Builds a set of sprites for alpha-blending blit
Modified: branches/FreeTrainSDL/core/framework/graphics/ColorLibrary.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/ColorLibrary.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/ColorLibrary.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,10 +23,10 @@
using System.Drawing;
using System.Collections;
using FreeTrain.world;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
using FreeTrain;
-namespace FreeTrain.Framework.plugin.graphics
+namespace FreeTrain.Framework.Plugin.Graphics
{
/// <summary>
/// ColorLibrary の概要の説明です。
Modified: branches/FreeTrainSDL/core/framework/graphics/ColorMap.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/ColorMap.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/ColorMap.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -21,7 +21,7 @@
using System;
using System.Drawing;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Determines the color mapping between daylight time and night time.
Modified: branches/FreeTrainSDL/core/framework/graphics/ColorMappedSprite.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/ColorMappedSprite.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/ColorMappedSprite.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -25,7 +25,7 @@
using FreeTrain.world;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Draw an image in the picture with color-mapping.
Modified: branches/FreeTrainSDL/core/framework/graphics/DefaultSpriteLoaderContributionImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/DefaultSpriteLoaderContributionImpl.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/DefaultSpriteLoaderContributionImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Xml;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// DefaultSpriteLoaderContributionImpl の概要の説明です。
Modified: branches/FreeTrainSDL/core/framework/graphics/DirectSprite.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/DirectSprite.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/DirectSprite.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -22,7 +22,7 @@
using System.Drawing;
using SDL.net;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Sprite that directly draws from a surface.
Modified: branches/FreeTrainSDL/core/framework/graphics/DirtyRect.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/DirtyRect.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/DirtyRect.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -22,7 +22,7 @@
using System.Diagnostics;
using System.Drawing;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Maintain a set of dirty rects.
Modified: branches/FreeTrainSDL/core/framework/graphics/GraphicsException.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/GraphicsException.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/GraphicsException.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -20,7 +20,7 @@
using System;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
///
Modified: branches/FreeTrainSDL/core/framework/graphics/HueTransformSprite.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/HueTransformSprite.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/HueTransformSprite.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -25,7 +25,7 @@
using FreeTrain.Framework.plugin;
using FreeTrain.world;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Draw an image in the picture with transforming colors by keying a hue.
Modified: branches/FreeTrainSDL/core/framework/graphics/NullSprite.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/NullSprite.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/NullSprite.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Runtime.Serialization;
using SDL.net;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Sprite that draws nothing.
Modified: branches/FreeTrainSDL/core/framework/graphics/Picture.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/Picture.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/Picture.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -26,7 +26,7 @@
using FreeTrain.world;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Wraps DirectDraw surface
Modified: branches/FreeTrainSDL/core/framework/graphics/PictureManager.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/PictureManager.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/PictureManager.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Diagnostics;
using FreeTrain.world;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Repository of pictures.
Modified: branches/FreeTrainSDL/core/framework/graphics/PreviewDrawer.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/PreviewDrawer.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/PreviewDrawer.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -24,7 +24,7 @@
using FreeTrain.world;
using SDL.net;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Utility class that draws a preview image programatically.
Modified: branches/FreeTrainSDL/core/framework/graphics/SimpleSprite.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/SimpleSprite.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/SimpleSprite.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -25,7 +25,7 @@
using FreeTrain.world;
using SDL.net;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Draw an image in the picture as-is.
Modified: branches/FreeTrainSDL/core/framework/graphics/Sprite.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/Sprite.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/Sprite.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -22,7 +22,7 @@
using System.Drawing;
using SDL.net;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// A sprite object that can draw itself to other surfaces.
Modified: branches/FreeTrainSDL/core/framework/graphics/SpriteFactory.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/SpriteFactory.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/SpriteFactory.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Xml;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Create a sprite from a picture.
Modified: branches/FreeTrainSDL/core/framework/graphics/SpriteFactoryContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/SpriteFactoryContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/SpriteFactoryContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -22,7 +22,7 @@
using System.Xml;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Let SpriteFactories to be contributed.
Modified: branches/FreeTrainSDL/core/framework/graphics/SpriteLoaderContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/SpriteLoaderContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/SpriteLoaderContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Xml;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// SpriteLoaderContribution encapsulates the details of how a set of sprites
Modified: branches/FreeTrainSDL/core/framework/graphics/SurfaceLoaders.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/SurfaceLoaders.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/SurfaceLoaders.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -24,7 +24,7 @@
using System.Runtime.InteropServices;
using SDL.net;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Function object that can load a picture into the given surface.
Modified: branches/FreeTrainSDL/core/framework/plugin/Contribution.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/plugin/Contribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/plugin/Contribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -27,10 +27,10 @@
using System.Windows.Forms;
using System.Xml;
using SDL.net;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
-namespace FreeTrain.Framework.plugin
+namespace FreeTrain.Framework.Plugin
{
/// <summary>
/// Common base class of contributions.
Modified: branches/FreeTrainSDL/core/framework/plugin/Plugin.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/plugin/Plugin.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/plugin/Plugin.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -28,7 +28,7 @@
using FreeTrain.Util;
using FreeTrain.Contributions.Train;
using FreeTrain.Contributions.Land;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.Framework.plugin
{
Modified: branches/FreeTrainSDL/core/framework/plugin/PluginManager.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/plugin/PluginManager.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/plugin/PluginManager.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -32,7 +32,7 @@
using FreeTrain.Contributions.Train;
using FreeTrain.Contributions.Common;
using FreeTrain.Contributions.Structs;
-using FreeTrain.Contributions.road;
+using FreeTrain.Contributions.Road;
namespace FreeTrain.Framework.plugin
{
Modified: branches/FreeTrainSDL/core/framework/plugin/PluginUtil.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/plugin/PluginUtil.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/plugin/PluginUtil.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -22,7 +22,7 @@
using System.Drawing;
using System.Reflection;
using System.Xml;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.Framework.plugin
{
Modified: branches/FreeTrainSDL/core/views/GlobalViewOptions.cs
===================================================================
--- branches/FreeTrainSDL/core/views/GlobalViewOptions.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/views/GlobalViewOptions.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -21,7 +21,7 @@
using System;
using System.Diagnostics;
using FreeTrain.world;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.Views
Modified: branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs
===================================================================
--- branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -27,7 +27,7 @@
using FreeTrain.Util;
using FreeTrain.world;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Controllers;
namespace FreeTrain.Views
Modified: branches/FreeTrainSDL/core/views/WeatherOverlayImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/views/WeatherOverlayImpl.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/views/WeatherOverlayImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -21,7 +21,7 @@
using System;
using System.Drawing;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using SDL.net;
namespace FreeTrain.Views
Modified: branches/FreeTrainSDL/core/views/WeatherOverlaySpriteSet.cs
===================================================================
--- branches/FreeTrainSDL/core/views/WeatherOverlaySpriteSet.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/views/WeatherOverlaySpriteSet.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -20,7 +20,7 @@
using System;
using System.Drawing;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.Views
{
Modified: branches/FreeTrainSDL/core/views/map/MapView.cs
===================================================================
--- branches/FreeTrainSDL/core/views/map/MapView.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/views/map/MapView.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -28,7 +28,7 @@
using FreeTrain.world;
using FreeTrain.Controllers;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using SDL.net;
namespace FreeTrain.Views.Map
Modified: branches/FreeTrainSDL/core/world/Clock.cs
===================================================================
--- branches/FreeTrainSDL/core/world/Clock.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/Clock.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Windows.Forms;
using FreeTrain.Util;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.world
{
Modified: branches/FreeTrainSDL/core/world/RRCrossing.cs
===================================================================
--- branches/FreeTrainSDL/core/world/RRCrossing.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/RRCrossing.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Drawing;
using System.Runtime.Serialization;
using FreeTrain.world.Rail;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.world
{
Modified: branches/FreeTrainSDL/core/world/Traffic.cs
===================================================================
--- branches/FreeTrainSDL/core/world/Traffic.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/Traffic.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Diagnostics;
using SDL.net;
using FreeTrain.world.Rail;
-using FreeTrain.world.road;
+using FreeTrain.world.Road;
namespace FreeTrain.world
{
@@ -44,7 +44,7 @@
private RailRoad _railRoad;
- private Road _road;
+ private BaseRoad _road;
private IAccessory _accessory;
/// <summary>
@@ -130,7 +130,7 @@
/// <summary>
/// Road that occupies this voxel, or null otherwise.
/// </summary>
- public Road road
+ public BaseRoad road
{
get
{
Modified: branches/FreeTrainSDL/core/world/Voxel.cs
===================================================================
--- branches/FreeTrainSDL/core/world/Voxel.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/Voxel.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -22,7 +22,7 @@
using System.Diagnostics;
using System.Drawing;
using SDL.net;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.world
{
Modified: branches/FreeTrainSDL/core/world/World.cs
===================================================================
--- branches/FreeTrainSDL/core/world/World.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/World.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -30,7 +30,7 @@
using FreeTrain.Contributions.Train;
using FreeTrain.Controllers;
using FreeTrain.Framework;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
using FreeTrain.world;
using FreeTrain.world.Rail;
using FreeTrain.Views;
Modified: branches/FreeTrainSDL/core/world/development/LandValue.cs
===================================================================
--- branches/FreeTrainSDL/core/world/development/LandValue.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/development/LandValue.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -19,7 +19,7 @@
#endregion LICENSE
using System;
-using FreeTrain.world.road;
+using FreeTrain.world.Road;
namespace FreeTrain.world.Development
{
@@ -195,7 +195,7 @@
int h, v;
World.world.toHV(loc.x, loc.y, out h, out v);
- Road roadFound = null;
+ BaseRoad roadFound = null;
bool hasMountain = false;
// FIXME: this code shouldn't have the knowledge of any particular voxel type.
Modified: branches/FreeTrainSDL/core/world/land/LandPropertyVoxel.cs
===================================================================
--- branches/FreeTrainSDL/core/world/land/LandPropertyVoxel.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/land/LandPropertyVoxel.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -21,7 +21,7 @@
using System;
using System.Diagnostics;
using System.Drawing;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using SDL.net;
namespace FreeTrain.world.Land
Modified: branches/FreeTrainSDL/core/world/rail/BridgePierVoxel.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/BridgePierVoxel.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/rail/BridgePierVoxel.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -22,7 +22,7 @@
using System.Drawing;
using SDL.net;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Util;
namespace FreeTrain.world.Rail
Modified: branches/FreeTrainSDL/core/world/rail/BridgeRail.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/BridgeRail.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/rail/BridgeRail.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -26,7 +26,7 @@
using SDL.net;
using FreeTrain.Contributions.Rail;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Util;
Modified: branches/FreeTrainSDL/core/world/rail/FatPlatform.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/FatPlatform.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/rail/FatPlatform.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -24,7 +24,7 @@
using System.Runtime.Serialization;
using SDL.net;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Util;
namespace FreeTrain.world.Rail
Modified: branches/FreeTrainSDL/core/world/rail/PassagewayRail.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/PassagewayRail.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/rail/PassagewayRail.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -22,7 +22,7 @@
using System.Diagnostics;
using System.Drawing;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.world.Rail
{
Modified: branches/FreeTrainSDL/core/world/rail/RailPattern.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/RailPattern.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/rail/RailPattern.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -24,7 +24,7 @@
using System.Runtime.Serialization;
using System.Windows.Forms;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Util;
using SDL.net;
Modified: branches/FreeTrainSDL/core/world/rail/SlopeRailRoad.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/SlopeRailRoad.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/rail/SlopeRailRoad.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -22,7 +22,7 @@
using System.Diagnostics;
using System.Drawing;
using System.Runtime.Serialization;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.world.Rail
{
Modified: branches/FreeTrainSDL/core/world/rail/StealSupportedRailContributionImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/StealSupportedRailContributionImpl.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/rail/StealSupportedRailContributionImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -26,7 +26,7 @@
using SDL.net;
using FreeTrain.Contributions.Rail;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Util;
Modified: branches/FreeTrainSDL/core/world/rail/ThinPlatform.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/ThinPlatform.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/rail/ThinPlatform.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -26,7 +26,7 @@
using SDL.net;
using FreeTrain.Util;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.world.Rail
{
Modified: branches/FreeTrainSDL/core/world/rail/Train.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/Train.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/rail/Train.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -26,7 +26,7 @@
using FreeTrain.Contributions.Train;
using FreeTrain.Framework;
using FreeTrain.Framework.Sound;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.world.Accounting;
using System.Runtime.Serialization;
Modified: branches/FreeTrainSDL/core/world/rail/TunnelRail.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/TunnelRail.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/rail/TunnelRail.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -26,7 +26,7 @@
using SDL.net;
using FreeTrain.Contributions.Rail;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Util;
using FreeTrain.world.Terrain;
Modified: branches/FreeTrainSDL/core/world/road/Bus.cs
===================================================================
--- branches/FreeTrainSDL/core/world/road/Bus.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/road/Bus.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -21,7 +21,7 @@
using System;
using System.Drawing;
-namespace FreeTrain.world.road
+namespace FreeTrain.world.Road
{
/// <summary>
/// Bus
Modified: branches/FreeTrainSDL/core/world/road/Road.cs
===================================================================
--- branches/FreeTrainSDL/core/world/road/Road.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/road/Road.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -21,13 +21,13 @@
using System;
using System.Drawing;
-namespace FreeTrain.world.road
+namespace FreeTrain.world.Road
{
/// <summary>
/// Automobile Road
/// </summary>
[Serializable]
- public abstract class Road
+ public abstract class BaseRoad
{
/// <summary>
///
@@ -35,7 +35,7 @@
/// <param name="tv"></param>
/// <param name="pattern"></param>
/// <param name="style"></param>
- protected Road(TrafficVoxel tv, RoadPattern pattern, RoadStyle style)
+ protected BaseRoad(TrafficVoxel tv, RoadPattern pattern, RoadStyle style)
{
this._style = style;
...
[truncated message content] |
