Changeset 899 for trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/ResourceAdapter.cs

Timestamp:

12/04/08 15:53:04 (15 years ago)

Author:

svonolfe

Message:

Added user adapter to the service locator (#372)

File:

• trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/ResourceAdapter.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/ResourceAdapter.cs

@@ -33 +33 @@
       new dsHiveServerTableAdapters.ResourceTableAdapter();
 
-    private Resource Convert(dsHiveServer.ResourceRow row) {
-      if (row != null) {
-        Resource resource = new Resource();
-
+    private Resource Convert(dsHiveServer.ResourceRow row, 
+      Resource resource) {
+      if (row != null && resource != null) {
         resource.ResourceId = row.ResourceId;
-        resource.Name = row.Name;
+        if (!row.IsNameNull())
+          resource.Name = row.Name;
+        else
+          resource.Name = String.Empty;
 
         return resource;
-      } else
+      } else 
         return null;
     }
@@ -49 +51 @@
       if (resource != null && row != null) {
         row.Name = resource.Name;
-      }
 
-      return row;
+        return row;
+      } else
+        return null;
     }
 
@@ -75 +78 @@
     }
 
+    internal bool FillResource(Resource resource) {
+      if (resource != null) {
+        dsHiveServer.ResourceDataTable data =
+          adapter.GetDataById(resource.ResourceId);
+        if (data.Count == 1) {
+          dsHiveServer.ResourceRow row =
+            data[0];
+          Convert(row, resource);
+
+          return true;
+        }
+      }
+
+      return false;
+    }
+
     public Resource GetResourceById(long resourceId) {
-      dsHiveServer.ResourceDataTable data =
-          adapter.GetDataById(resourceId);
-      if (data.Count == 1) {
-        dsHiveServer.ResourceRow row =
-          data[0];
-        return Convert(row);
-      } else {
+      Resource resource = new Resource();
+      resource.ResourceId = resourceId;
+
+      if(FillResource(resource)) 
+        return resource;
+      else 
         return null;
-      }
     }
 
@@ -95 +112 @@
 
       foreach (dsHiveServer.ResourceRow row in data) {
-        allResources.Add(Convert(row));
+        Resource resource = new Resource();
+        Convert(row, resource);
+        allResources.Add(resource);
       }