aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Data.DB4o
diff options
context:
space:
mode:
authorlbsa712008-03-28 15:05:06 +0000
committerlbsa712008-03-28 15:05:06 +0000
commit0e16488ca8898de80b8e169d03a78c64a9e26816 (patch)
tree87ed81db2cbef41523b25cf6525267550792fa66 /OpenSim/Framework/Data.DB4o
parentattempt to fix mantis # 779. (diff)
downloadopensim-SC-0e16488ca8898de80b8e169d03a78c64a9e26816.zip
opensim-SC-0e16488ca8898de80b8e169d03a78c64a9e26816.tar.gz
opensim-SC-0e16488ca8898de80b8e169d03a78c64a9e26816.tar.bz2
opensim-SC-0e16488ca8898de80b8e169d03a78c64a9e26816.tar.xz
* Introduced base abstract provider class for GridData
Diffstat (limited to 'OpenSim/Framework/Data.DB4o')
-rw-r--r--OpenSim/Framework/Data.DB4o/DB4oGridData.cs24
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Framework/Data.DB4o/DB4oGridData.cs b/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
index 9320ef9..31b13e3 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Framework.Data.DB4o
34 /// <summary> 34 /// <summary>
35 /// A grid server storage mechanism employing the DB4o database system 35 /// A grid server storage mechanism employing the DB4o database system
36 /// </summary> 36 /// </summary>
37 internal class DB4oGridData : IGridData 37 internal class DB4oGridData : GridDataBase
38 { 38 {
39 /// <summary> 39 /// <summary>
40 /// The database manager object 40 /// The database manager object
@@ -44,7 +44,7 @@ namespace OpenSim.Framework.Data.DB4o
44 /// <summary> 44 /// <summary>
45 /// Called when the plugin is first loaded (as constructors are not called) 45 /// Called when the plugin is first loaded (as constructors are not called)
46 /// </summary> 46 /// </summary>
47 public void Initialise() 47 override public void Initialise()
48 { 48 {
49 manager = new DB4oGridManager("gridserver.yap"); 49 manager = new DB4oGridManager("gridserver.yap");
50 } 50 }
@@ -57,7 +57,7 @@ namespace OpenSim.Framework.Data.DB4o
57 /// <param name="c">maximum X coordinate</param> 57 /// <param name="c">maximum X coordinate</param>
58 /// <param name="d">maximum Y coordinate</param> 58 /// <param name="d">maximum Y coordinate</param>
59 /// <returns>An array of region profiles</returns> 59 /// <returns>An array of region profiles</returns>
60 public RegionProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d) 60 override public RegionProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d)
61 { 61 {
62 return null; 62 return null;
63 } 63 }
@@ -67,7 +67,7 @@ namespace OpenSim.Framework.Data.DB4o
67 /// </summary> 67 /// </summary>
68 /// <param name="handle">The handle to search for</param> 68 /// <param name="handle">The handle to search for</param>
69 /// <returns>A region profile</returns> 69 /// <returns>A region profile</returns>
70 public RegionProfileData GetProfileByHandle(ulong handle) 70 override public RegionProfileData GetProfileByHandle(ulong handle)
71 { 71 {
72 lock (manager.simProfiles) 72 lock (manager.simProfiles)
73 { 73 {
@@ -87,7 +87,7 @@ namespace OpenSim.Framework.Data.DB4o
87 /// </summary> 87 /// </summary>
88 /// <param name="uuid">The region ID code</param> 88 /// <param name="uuid">The region ID code</param>
89 /// <returns>A region profile</returns> 89 /// <returns>A region profile</returns>
90 public RegionProfileData GetProfileByLLUUID(LLUUID uuid) 90 override public RegionProfileData GetProfileByLLUUID(LLUUID uuid)
91 { 91 {
92 lock (manager.simProfiles) 92 lock (manager.simProfiles)
93 { 93 {
@@ -98,7 +98,7 @@ namespace OpenSim.Framework.Data.DB4o
98 "). Total Registered Regions: " + manager.simProfiles.Count); 98 "). Total Registered Regions: " + manager.simProfiles.Count);
99 } 99 }
100 100
101 public RegionProfileData GetProfileByString(string regionName) 101 override public RegionProfileData GetProfileByString(string regionName)
102 { 102 {
103 throw new Exception("GetProfileByString Not supported in DB4oGridData"); 103 throw new Exception("GetProfileByString Not supported in DB4oGridData");
104 //return null; 104 //return null;
@@ -109,7 +109,7 @@ namespace OpenSim.Framework.Data.DB4o
109 /// </summary> 109 /// </summary>
110 /// <param name="profile">The profile to add</param> 110 /// <param name="profile">The profile to add</param>
111 /// <returns>A dataresponse enum indicating success</returns> 111 /// <returns>A dataresponse enum indicating success</returns>
112 public DataResponse AddProfile(RegionProfileData profile) 112 override public DataResponse AddProfile(RegionProfileData profile)
113 { 113 {
114 lock (manager.simProfiles) 114 lock (manager.simProfiles)
115 { 115 {
@@ -131,7 +131,7 @@ namespace OpenSim.Framework.Data.DB4o
131 /// <param name="handle">The location the region is logging into (unused in Db4o)</param> 131 /// <param name="handle">The location the region is logging into (unused in Db4o)</param>
132 /// <param name="key">The shared secret</param> 132 /// <param name="key">The shared secret</param>
133 /// <returns>Authenticated?</returns> 133 /// <returns>Authenticated?</returns>
134 public bool AuthenticateSim(LLUUID uuid, ulong handle, string key) 134 override public bool AuthenticateSim(LLUUID uuid, ulong handle, string key)
135 { 135 {
136 if (manager.simProfiles[uuid].regionRecvKey == key) 136 if (manager.simProfiles[uuid].regionRecvKey == key)
137 return true; 137 return true;
@@ -141,7 +141,7 @@ namespace OpenSim.Framework.Data.DB4o
141 /// <summary> 141 /// <summary>
142 /// Shuts down the database 142 /// Shuts down the database
143 /// </summary> 143 /// </summary>
144 public void Close() 144 override public void Close()
145 { 145 {
146 manager = null; 146 manager = null;
147 } 147 }
@@ -160,7 +160,7 @@ namespace OpenSim.Framework.Data.DB4o
160 /// Returns the providers name 160 /// Returns the providers name
161 /// </summary> 161 /// </summary>
162 /// <returns>The name of the storage system</returns> 162 /// <returns>The name of the storage system</returns>
163 public string getName() 163 override public string getName()
164 { 164 {
165 return "DB4o Grid Provider"; 165 return "DB4o Grid Provider";
166 } 166 }
@@ -169,12 +169,12 @@ namespace OpenSim.Framework.Data.DB4o
169 /// Returns the providers version 169 /// Returns the providers version
170 /// </summary> 170 /// </summary>
171 /// <returns>The version of the storage system</returns> 171 /// <returns>The version of the storage system</returns>
172 public string getVersion() 172 override public string getVersion()
173 { 173 {
174 return "0.1"; 174 return "0.1";
175 } 175 }
176 176
177 public ReservationData GetReservationAtPoint(uint x, uint y) 177 override public ReservationData GetReservationAtPoint(uint x, uint y)
178 { 178 {
179 return null; 179 return null;
180 } 180 }