X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=source%2Fmir%2Fmodule%2FAbstractModule.java;h=eb4f9dab725d065ee96556c1c691019e795eb2b1;hb=cf307fb194f4e8f7db48a2b61f88587157c09aa0;hp=94fbffb1bd05c4204863a624f717d4e0804e3853;hpb=213122e7c65211f549722f05aa8e0135f15af35c;p=mir.git

diff --git a/source/mir/module/AbstractModule.java b/source/mir/module/AbstractModule.java
index 94fbffb1..eb4f9dab 100755
--- a/source/mir/module/AbstractModule.java
+++ b/source/mir/module/AbstractModule.java
@@ -29,13 +29,11 @@
  */
 package  mir.module;
 
-import java.util.Map;
-import java.sql.SQLException;
-
 import mir.entity.Entity;
 import mir.entity.EntityList;
-import mir.storage.StorageObject;
+import mir.storage.Database;
 
+import java.util.Map;
 
 /**
  * This class provides the base functionality for the derived Module-Classes.
@@ -50,29 +48,28 @@ import mir.storage.StorageObject;
  */
 
 public class AbstractModule {
-  protected StorageObject storage;
+  protected Database database;
 
-  public AbstractModule(StorageObject aStorageObject) {
-    storage = aStorageObject;
+  public AbstractModule(Database aDatabase) {
+    database = aDatabase;
   }
 
   /**
-   * Returns the storage object associated with this module
+   * Returns the database object associated with this module
    */
-  public StorageObject getStorageObject () {
-    return storage;
+  public Database getStorageObject () {
+    return database;
   }
 
   public Entity getById (String id) throws ModuleExc, ModuleFailure {
     try {
-      if (storage == null)
-        throw  new ModuleExc("AbstractModule.getById: No StorageObject set!");
-      Entity entity = storage.selectById(id);
+      if (database == null)
+        throw  new ModuleExc("AbstractModule.getById: No Database set!");
+      Entity entity = database.selectById(id);
 
       if (entity == null)
         throw new ModuleExc("AbstractModule.getById: No object for id = " + id);
-      else
-        return entity;
+			return entity;
     }
     catch (Throwable e) {
       throw new ModuleFailure(e);
@@ -81,26 +78,19 @@ public class AbstractModule {
 
   public EntityList getByWhereClause (String whereClause, int offset) throws ModuleExc, ModuleFailure {
     try {
-      if (storage == null)
-        throw  new ModuleExc("AbstractModule.getByWhereClause: No StorageObject set!");
+      if (database == null)
+        throw  new ModuleExc("AbstractModule.getByWhereClause: No Database set!");
 
-      return storage.selectByWhereClause(whereClause, offset);
+      return database.selectByWhereClause(whereClause, offset);
     }
     catch (Throwable e) {
       throw new ModuleFailure(e);
     }
   }
 
-  /**
-   *    * Standardfunktion, um einen Datensatz via StorageObject einzuf?gen
-   * @param theValues Hash mit Spalte/Wert-Paaren
-   * @return Id des eingef?gten Objekts
-   * @exception ModuleExc
-   * @exception ModuleFailure
-   */
   public String add(Map theValues) throws ModuleExc, ModuleFailure {
     try {
-      Entity entity = storage.createNewEntity();
+      Entity entity = database.createNewEntity();
       entity.setFieldValues(theValues);
 
       return entity.insert();
@@ -110,16 +100,9 @@ public class AbstractModule {
     }
   }
 
-  /**
-   * Standardfunktion, um einen Datensatz via StorageObject zu aktualisieren
-   * @param theValues Hash mit Spalte/Wert-Paaren
-   * @return Id des eingef?gten Objekts
-   * @exception ModuleExc
-   * @exception ModuleFailure
-   */
   public String set (Map theValues) throws ModuleExc, ModuleFailure {
     try {
-      Entity theEntity = storage.selectById((String) theValues.get("id"));
+      Entity theEntity = database.selectById((String) theValues.get("id"));
       if (theEntity == null)
         throw new ModuleExc("No object found with id " + theValues.get("id"));
       theEntity.setFieldValues(theValues);
@@ -139,23 +122,10 @@ public class AbstractModule {
    */
   public void deleteById (String idParam) throws ModuleExc, ModuleFailure {
     try {
-      storage.delete(idParam);
+      database.delete(idParam);
     }
     catch (Throwable e) {
       throw new ModuleFailure(e);
     }
   }
-
-  /**
-   * returns the number of rows
-   */
-  public int getSize(String where) throws ModuleExc, ModuleFailure {
-    try {
-      return storage.getSize(where);
-    }
-    catch (SQLException e) {
-      throw new ModuleFailure("Can't retrieve number of entities: " + e.toString(), e);
-    }
-  }
-
 }