minor refactoring. Change getName and GetVersion methods (yes the had different casings)

to Name and Version properties for the User stores.
0.6.0-stable
Sean Dague 2008-05-02 12:35:24 +00:00
parent b1aacfe0d4
commit 4a8f432441
7 changed files with 19 additions and 30 deletions

View File

@ -775,18 +775,18 @@ namespace OpenSim.Data.MSSQL
/// Database provider name /// Database provider name
/// </summary> /// </summary>
/// <returns>Provider name</returns> /// <returns>Provider name</returns>
override public string getName() override public string Name
{ {
return "MSSQL Userdata Interface"; get {return "MSSQL Userdata Interface";}
} }
/// <summary> /// <summary>
/// Database provider version /// Database provider version
/// </summary> /// </summary>
/// <returns>provider version</returns> /// <returns>provider version</returns>
override public string GetVersion() override public string Version
{ {
return database.getVersion(); get {return database.getVersion();}
} }
/// <summary> /// <summary>

View File

@ -659,18 +659,18 @@ namespace OpenSim.Data.MySQL
/// Database provider name /// Database provider name
/// </summary> /// </summary>
/// <returns>Provider name</returns> /// <returns>Provider name</returns>
override public string getName() override public string Name
{ {
return "MySQL Userdata Interface"; get {return "MySQL Userdata Interface";}
} }
/// <summary> /// <summary>
/// Database provider version /// Database provider version
/// </summary> /// </summary>
/// <returns>provider version</returns> /// <returns>provider version</returns>
override public string GetVersion() override public string Version
{ {
return "0.1"; get {return "0.1";}
} }
} }
} }

View File

@ -265,22 +265,11 @@ namespace OpenSim.Data.NHibernate
return new List<LLUUID>(); return new List<LLUUID>();
} }
public override string Name {
public override string getName()
{
return Name;
}
public string Name {
get { return "NHibernate"; } get { return "NHibernate"; }
} }
public override string GetVersion() public override string Version {
{
return Version;
}
public string Version {
get { return "0.1"; } get { return "0.1"; }
} }

View File

@ -505,18 +505,18 @@ namespace OpenSim.Data.SQLite
/// Returns the name of the storage provider /// Returns the name of the storage provider
/// </summary> /// </summary>
/// <returns>Storage provider name</returns> /// <returns>Storage provider name</returns>
override public string getName() override public string Name
{ {
return "Sqlite Userdata"; get {return "Sqlite Userdata";}
} }
/// <summary> /// <summary>
/// Returns the version of the storage provider /// Returns the version of the storage provider
/// </summary> /// </summary>
/// <returns>Storage provider version</returns> /// <returns>Storage provider version</returns>
override public string GetVersion() override public string Version
{ {
return "0.1"; get {return "0.1";}
} }
/*********************************************************************** /***********************************************************************

View File

@ -49,8 +49,8 @@ namespace OpenSim.Data
public abstract List<FriendListItem> GetUserFriendList(LLUUID friendlistowner); public abstract List<FriendListItem> GetUserFriendList(LLUUID friendlistowner);
public abstract bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount); public abstract bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount);
public abstract bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory); public abstract bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory);
public abstract string GetVersion(); public abstract string Version {get;}
public abstract string getName(); public abstract string Name {get;}
public abstract void Initialise(); public abstract void Initialise();
public abstract List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query); public abstract List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query);
public abstract UserAppearance GetUserAppearance(LLUUID user); public abstract UserAppearance GetUserAppearance(LLUUID user);

View File

@ -81,7 +81,7 @@ namespace OpenSim.Framework.Communications
public void AddPlugin(IUserData plug) public void AddPlugin(IUserData plug)
{ {
plug.Initialise(); plug.Initialise();
_plugins.Add(plug.getName(), plug); _plugins.Add(plug.Name, plug);
m_log.Info("[USERSTORAGE]: Added IUserData Interface"); m_log.Info("[USERSTORAGE]: Added IUserData Interface");
} }

View File

@ -162,13 +162,13 @@ namespace OpenSim.Framework
/// Returns the plugin version /// Returns the plugin version
/// </summary> /// </summary>
/// <returns>Plugin version in MAJOR.MINOR.REVISION.BUILD format</returns> /// <returns>Plugin version in MAJOR.MINOR.REVISION.BUILD format</returns>
string GetVersion(); string Version {get;}
/// <summary> /// <summary>
/// Returns the plugin name /// Returns the plugin name
/// </summary> /// </summary>
/// <returns>Plugin name, eg MySQL User Provider</returns> /// <returns>Plugin name, eg MySQL User Provider</returns>
string getName(); string Name {get;}
/// <summary> /// <summary>
/// Initialises the plugin (artificial constructor) /// Initialises the plugin (artificial constructor)