reorganizing namespaces to put all the Data stuff into it's own namespace

/ dir structure.  This is coming in over a few changesets so consider trunk
broken for the next 30 minutes as these get pulled together.

1 files changed, 170 insertions, 0 deletions

diff --git a/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs b/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs
new file mode 100644
index 0000000..51adf89
--- /dev/null
+++ b/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using OpenSim.Framework;
+using OpenSim.Framework.Data.Base;
+using libsecondlife;
+
+namespace OpenSim.Framework.Data
+{
+    public class PrimitiveBaseShapeRowMapper : BaseRowMapper<PrimitiveBaseShape>
+    {
+        public Guid SceneObjectPartId;
+
+        public PrimitiveBaseShapeRowMapper(BaseSchema schema, PrimitiveBaseShape obj) : base(schema, obj)
+        {
+        }
+    }
+
+    public class PrimitiveBaseShapeTableMapper : OpenSimTableMapper<PrimitiveBaseShapeRowMapper, Guid>
+    {
+        public PrimitiveBaseShapeTableMapper(BaseDatabaseConnector connection, string tableName)
+            : base(connection, tableName)
+        {
+            BaseSchema<PrimitiveBaseShapeRowMapper> rowMapperSchema = new BaseSchema<PrimitiveBaseShapeRowMapper>(this);
+            m_schema = rowMapperSchema;
+
+            m_keyFieldMapper = rowMapperSchema.AddMapping<Guid>("SceneObjectPartId",
+                                                                delegate(PrimitiveBaseShapeRowMapper shape) { return shape.SceneObjectPartId; },
+                                                                delegate(PrimitiveBaseShapeRowMapper shape, Guid value) { shape.SceneObjectPartId = value; });
+
+            rowMapperSchema.AddMapping<byte>("PCode",
+                                             delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.PCode; },
+                                             delegate(PrimitiveBaseShapeRowMapper shape, byte value) { shape.Object.PCode = value; });
+
+            rowMapperSchema.AddMapping<ushort>("PathBegin",
+                                               delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.PathBegin; },
+                                               delegate(PrimitiveBaseShapeRowMapper shape, ushort value) { shape.Object.PathBegin = value; });
+
+            rowMapperSchema.AddMapping<ushort>("PathEnd",
+                                               delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.PathEnd; },
+                                               delegate(PrimitiveBaseShapeRowMapper shape, ushort value) { shape.Object.PathEnd = value; });
+
+            rowMapperSchema.AddMapping<byte>("PathScaleX",
+                                             delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.PathScaleX; },
+                                             delegate(PrimitiveBaseShapeRowMapper shape, byte value) { shape.Object.PathScaleX = value; });
+
+            rowMapperSchema.AddMapping<byte>("PathScaleY",
+                                             delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.PathScaleY; },
+                                             delegate(PrimitiveBaseShapeRowMapper shape, byte value) { shape.Object.PathScaleY = value; });
+
+            rowMapperSchema.AddMapping<byte>("PathShearX",
+                                             delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.PathShearX; },
+                                             delegate(PrimitiveBaseShapeRowMapper shape, byte value) { shape.Object.PathShearX = value; });
+
+            rowMapperSchema.AddMapping<byte>("PathShearY",
+                                             delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.PathShearY; },
+                                             delegate(PrimitiveBaseShapeRowMapper shape, byte value) { shape.Object.PathShearY = value; });
+
+            rowMapperSchema.AddMapping<ushort>("ProfileBegin",
+                                               delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.ProfileBegin; },
+                                               delegate(PrimitiveBaseShapeRowMapper shape, ushort value) { shape.Object.ProfileBegin = value; });
+
+            rowMapperSchema.AddMapping<ushort>("ProfileEnd",
+                                               delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.ProfileEnd; },
+                                               delegate(PrimitiveBaseShapeRowMapper shape, ushort value) { shape.Object.ProfileEnd = value; });
+
+            rowMapperSchema.AddMapping<LLVector3>("Scale",
+                                                       delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.Scale; },
+                                                       delegate(PrimitiveBaseShapeRowMapper shape, LLVector3 value) { shape.Object.Scale = value; });
+
+            rowMapperSchema.AddMapping<sbyte>("PathTaperX",
+                                              delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.PathTaperX; },
+                                              delegate(PrimitiveBaseShapeRowMapper shape, sbyte value) { shape.Object.PathTaperX = value; });
+
+            rowMapperSchema.AddMapping<sbyte>("PathTaperY",
+                                              delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.PathTaperY; },
+                                              delegate(PrimitiveBaseShapeRowMapper shape, sbyte value) { shape.Object.PathTaperY = value; });
+
+            rowMapperSchema.AddMapping<sbyte>("PathTwist",
+                                              delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.PathTwist; },
+                                              delegate(PrimitiveBaseShapeRowMapper shape, sbyte value) { shape.Object.PathTwist = value; });
+
+            rowMapperSchema.AddMapping<sbyte>("PathRadiusOffset",
+                                              delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.PathRadiusOffset; },
+                                              delegate(PrimitiveBaseShapeRowMapper shape, sbyte value) { shape.Object.PathRadiusOffset = value; });
+
+            rowMapperSchema.AddMapping<byte>("PathRevolutions",
+                                             delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.PathRevolutions; },
+                                             delegate(PrimitiveBaseShapeRowMapper shape, byte value) { shape.Object.PathRevolutions = value; });
+
+            rowMapperSchema.AddMapping<sbyte>("PathTwistBegin",
+                                              delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.PathTwistBegin; },
+                                              delegate(PrimitiveBaseShapeRowMapper shape, sbyte value) { shape.Object.PathTwistBegin = value; });
+
+            rowMapperSchema.AddMapping<byte>("PathCurve",
+                                             delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.PathCurve; },
+                                             delegate(PrimitiveBaseShapeRowMapper shape, byte value) { shape.Object.PathCurve = value; });
+
+            rowMapperSchema.AddMapping<byte>("ProfileCurve",
+                                             delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.ProfileCurve; },
+                                             delegate(PrimitiveBaseShapeRowMapper shape, byte value) { shape.Object.ProfileCurve = value; });
+
+            rowMapperSchema.AddMapping<ushort>("ProfileHollow",
+                                               delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.ProfileHollow; },
+                                               delegate(PrimitiveBaseShapeRowMapper shape, ushort value) { shape.Object.ProfileHollow = value; });
+
+            rowMapperSchema.AddMapping<byte[]>("TextureEntry",
+                                               delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.TextureEntry; },
+                                               delegate(PrimitiveBaseShapeRowMapper shape, byte[] value) { shape.Object.TextureEntry = value; });
+
+            rowMapperSchema.AddMapping<byte[]>("ExtraParams",
+                                               delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.ExtraParams; },
+                                               delegate(PrimitiveBaseShapeRowMapper shape, byte[] value) { shape.Object.ExtraParams = value; });            
+        }
+
+        public override PrimitiveBaseShapeRowMapper FromReader(BaseDataReader reader)
+        {
+            PrimitiveBaseShape shape = new PrimitiveBaseShape();
+
+            PrimitiveBaseShapeRowMapper mapper = new PrimitiveBaseShapeRowMapper(m_schema, shape);
+            mapper.FillObject( reader );
+
+            return mapper;
+        }
+
+        public bool Update(Guid sceneObjectPartId, PrimitiveBaseShape primitiveBaseShape)
+        {
+            PrimitiveBaseShapeRowMapper mapper = CreateRowMapper(sceneObjectPartId, primitiveBaseShape);
+            return Update(sceneObjectPartId, mapper);
+        }
+
+        public bool Add(Guid sceneObjectPartId, PrimitiveBaseShape primitiveBaseShape)
+        {
+            PrimitiveBaseShapeRowMapper mapper = CreateRowMapper(sceneObjectPartId, primitiveBaseShape);
+            return Add(mapper);
+        }
+
+        private PrimitiveBaseShapeRowMapper CreateRowMapper(Guid sceneObjectPartId, PrimitiveBaseShape primitiveBaseShape)
+        {
+            PrimitiveBaseShapeRowMapper mapper = new PrimitiveBaseShapeRowMapper( m_schema, primitiveBaseShape );
+            mapper.SceneObjectPartId = sceneObjectPartId;
+            return mapper;
+        }
+    }
+}