OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed some svn properties

0.6.2-post-fixes
Homer Horwitz 2009-01-12 19:24:20 +00:00
parent d4d2c19594
commit 7caf1a4abf
2 changed files with 134 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

212
OpenSim/Data/NHibernate/ColorUserType.cs
View File

@ -1,106 +1,106 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * 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 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using System.Data; using System.Data;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using NHibernate; using NHibernate;
using NHibernate.SqlTypes; using NHibernate.SqlTypes;
using NHibernate.UserTypes; using NHibernate.UserTypes;
using System.Drawing; using System.Drawing;
namespace OpenSim.Data.NHibernate namespace OpenSim.Data.NHibernate
{ {
[Serializable] [Serializable]
public class ColorUserType : IUserType public class ColorUserType : IUserType
{ {
public object Assemble(object cached, object owner) public object Assemble(object cached, object owner)
{ {
return cached; return cached;
} }
bool IUserType.Equals(object color1, object color2) bool IUserType.Equals(object color1, object color2)
{ {
return color1.Equals(color2); return color1.Equals(color2);
} }
public object DeepCopy(object color) public object DeepCopy(object color)
{ {
return color; return color;
} }
public object Disassemble(object color) public object Disassemble(object color)
{ {
return color; return color;
} }
public int GetHashCode(object color) public int GetHashCode(object color)
{ {
return (color == null) ? 0 : color.GetHashCode(); return (color == null) ? 0 : color.GetHashCode();
} }
public bool IsMutable public bool IsMutable
{ {
get { return false; } get { return false; }
} }
public object NullSafeGet(IDataReader rs, string[] names, object owner) public object NullSafeGet(IDataReader rs, string[] names, object owner)
{ {
Color color=Color.Empty; Color color=Color.Empty;
int ord = rs.GetOrdinal(names[0]); int ord = rs.GetOrdinal(names[0]);
if (!rs.IsDBNull(ord)) if (!rs.IsDBNull(ord))
{ {
color = Color.FromArgb(rs.GetInt32(ord)); color = Color.FromArgb(rs.GetInt32(ord));
} }
return color; return color;
} }
public void NullSafeSet(IDbCommand cmd, object obj, int index) public void NullSafeSet(IDbCommand cmd, object obj, int index)
{ {
Color color = (Color)obj; Color color = (Color)obj;
((IDataParameter)cmd.Parameters[index]).Value = color.ToArgb(); ((IDataParameter)cmd.Parameters[index]).Value = color.ToArgb();
} }
public object Replace(object original, object target, object owner) public object Replace(object original, object target, object owner)
{ {
return original; return original;
} }
public Type ReturnedType public Type ReturnedType
{ {
get { return typeof(Color); } get { return typeof(Color); }
} }
public SqlType[] SqlTypes public SqlType[] SqlTypes
{ {
get { return new SqlType [] { NHibernateUtil.Int32.SqlType }; } get { return new SqlType [] { NHibernateUtil.Int32.SqlType }; }
} }
} }
} }

56
OpenSim/Data/NHibernate/UserFriend.cs
View File

@ -1,28 +1,28 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Data.NHibernate namespace OpenSim.Data.NHibernate
{ {
public class UserFriend public class UserFriend
{ {
public UserFriend() public UserFriend()
{ {
} }
public UserFriend(UUID userFriendID, UUID ownerID, UUID friendID, uint friendPermissions) public UserFriend(UUID userFriendID, UUID ownerID, UUID friendID, uint friendPermissions)
{ {
this.UserFriendID = userFriendID; this.UserFriendID = userFriendID;
this.OwnerID = ownerID; this.OwnerID = ownerID;
this.FriendID = friendID; this.FriendID = friendID;
this.FriendPermissions = friendPermissions; this.FriendPermissions = friendPermissions;
} }
public UUID UserFriendID { get; set; } public UUID UserFriendID { get; set; }
public UUID OwnerID { get; set; } public UUID OwnerID { get; set; }
public UUID FriendID { get; set; } public UUID FriendID { get; set; }
public uint FriendPermissions { get; set; } public uint FriendPermissions { get; set; }
} }
} }