diff options
author | lbsa71 | 2008-01-15 20:07:02 +0000 |
---|---|---|
committer | lbsa71 | 2008-01-15 20:07:02 +0000 |
commit | f5103b98be60cc8b1a69288328cdc20f78857835 (patch) | |
tree | b50381385478f57a05ed9fef7c5176397d76d2f2 /OpenSim/Framework | |
parent | * Added some comments to the linkset positioning code (diff) | |
download | opensim-SC-f5103b98be60cc8b1a69288328cdc20f78857835.zip opensim-SC-f5103b98be60cc8b1a69288328cdc20f78857835.tar.gz opensim-SC-f5103b98be60cc8b1a69288328cdc20f78857835.tar.bz2 opensim-SC-f5103b98be60cc8b1a69288328cdc20f78857835.tar.xz |
* Renamed a bunch of Data baseclasses for clarity and readability
(Slowly getting there)
Diffstat (limited to '')
4 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/Data/OpenSimDatabaseMapper.cs b/OpenSim/Framework/Data/OpenSimDatabaseMapper.cs index bb82462..4f202bc 100644 --- a/OpenSim/Framework/Data/OpenSimDatabaseMapper.cs +++ b/OpenSim/Framework/Data/OpenSimDatabaseMapper.cs | |||
@@ -4,7 +4,7 @@ using TribalMedia.Framework.Data; | |||
4 | 4 | ||
5 | namespace OpenSim.Framework.Data | 5 | namespace OpenSim.Framework.Data |
6 | { | 6 | { |
7 | public abstract class OpenSimDatabaseMapper : DatabaseMapper | 7 | public abstract class OpenSimDatabaseMapper : BaseDatabaseConnector |
8 | { | 8 | { |
9 | public OpenSimDatabaseMapper(string connectionString) : base(connectionString) | 9 | public OpenSimDatabaseMapper(string connectionString) : base(connectionString) |
10 | { | 10 | { |
diff --git a/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs b/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs index 851ebcd..d8c2ddf 100644 --- a/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs +++ b/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs | |||
@@ -9,7 +9,7 @@ namespace OpenSim.Framework.Data | |||
9 | { | 9 | { |
10 | public class OpenSimObjectFieldMapper<TObject, TField> : ObjectField<TObject, TField> | 10 | public class OpenSimObjectFieldMapper<TObject, TField> : ObjectField<TObject, TField> |
11 | { | 11 | { |
12 | public OpenSimObjectFieldMapper(TableMapper tableMapper, string fieldName, | 12 | public OpenSimObjectFieldMapper(BaseTableMapper tableMapper, string fieldName, |
13 | ObjectGetAccessor<TObject, TField> rowMapperGetAccessor, | 13 | ObjectGetAccessor<TObject, TField> rowMapperGetAccessor, |
14 | ObjectSetAccessor<TObject, TField> rowMapperSetAccessor) | 14 | ObjectSetAccessor<TObject, TField> rowMapperSetAccessor) |
15 | : base(tableMapper, fieldName, rowMapperGetAccessor, rowMapperSetAccessor) | 15 | : base(tableMapper, fieldName, rowMapperGetAccessor, rowMapperSetAccessor) |
@@ -40,7 +40,7 @@ namespace OpenSim.Framework.Data | |||
40 | } | 40 | } |
41 | else | 41 | else |
42 | { | 42 | { |
43 | base.ExpandField<TObj>(obj, command, fieldNames); | 43 | base.ExpandField(obj, command, fieldNames); |
44 | } | 44 | } |
45 | } | 45 | } |
46 | 46 | ||
diff --git a/OpenSim/Framework/Data/OpenSimTableMapper.cs b/OpenSim/Framework/Data/OpenSimTableMapper.cs index c72f523..b6406b6 100644 --- a/OpenSim/Framework/Data/OpenSimTableMapper.cs +++ b/OpenSim/Framework/Data/OpenSimTableMapper.cs | |||
@@ -3,9 +3,9 @@ using TribalMedia.Framework.Data; | |||
3 | 3 | ||
4 | namespace OpenSim.Framework.Data | 4 | namespace OpenSim.Framework.Data |
5 | { | 5 | { |
6 | public abstract class OpenSimTableMapper<TRowMapper, TPrimaryKey> : ObjectTableMapper<TRowMapper, TPrimaryKey> | 6 | public abstract class OpenSimTableMapper<TRowMapper, TPrimaryKey> : BaseTableMapper<TRowMapper, TPrimaryKey> |
7 | { | 7 | { |
8 | public OpenSimTableMapper(DatabaseMapper database, string tableName) : base(database, tableName) | 8 | public OpenSimTableMapper(BaseDatabaseConnector database, string tableName) : base(database, tableName) |
9 | { | 9 | { |
10 | } | 10 | } |
11 | 11 | ||
diff --git a/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs b/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs index c8098ab..af49376 100644 --- a/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs +++ b/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs | |||
@@ -16,10 +16,10 @@ namespace OpenSim.Framework.Data | |||
16 | 16 | ||
17 | public class PrimitiveBaseShapeTableMapper : OpenSimTableMapper<PrimitiveBaseShapeRowMapper, Guid> | 17 | public class PrimitiveBaseShapeTableMapper : OpenSimTableMapper<PrimitiveBaseShapeRowMapper, Guid> |
18 | { | 18 | { |
19 | public PrimitiveBaseShapeTableMapper(DatabaseMapper connection, string tableName) | 19 | public PrimitiveBaseShapeTableMapper(BaseDatabaseConnector connection, string tableName) |
20 | : base(connection, tableName) | 20 | : base(connection, tableName) |
21 | { | 21 | { |
22 | RowMapperSchema<PrimitiveBaseShapeRowMapper> rowMapperSchema = new RowMapperSchema<PrimitiveBaseShapeRowMapper>(this); | 22 | ObjectSchema<PrimitiveBaseShapeRowMapper> rowMapperSchema = new ObjectSchema<PrimitiveBaseShapeRowMapper>(this); |
23 | m_schema = rowMapperSchema; | 23 | m_schema = rowMapperSchema; |
24 | 24 | ||
25 | m_keyFieldMapper = rowMapperSchema.AddMapping<Guid>("SceneObjectPartId", | 25 | m_keyFieldMapper = rowMapperSchema.AddMapping<Guid>("SceneObjectPartId", |