first cut of merge of STABLE-pre1_0 into HEAD. I won't even guarantee that it

[mir.git] / source / mircoders / entity / EntityUsers.java

diff --git a/source/mircoders/entity/EntityUsers.java b/source/mircoders/entity/EntityUsers.java
index 8e9459b..1fbded3 100755 (executable)
--- a/source/mircoders/entity/EntityUsers.java
+++ b/source/mircoders/entity/EntityUsers.java
@@ -5,9 +5,9 @@ import java.io.*;
 import java.util.*;
 import java.sql.*;
 
-import webdb.entity.*;
-import webdb.misc.*;
-import webdb.storage.*;
+import mir.entity.*;
+import mir.misc.*;
+import mir.storage.*;
 
 /**
  * This class is objectmapping of database webdb_users
@@ -17,14 +17,12 @@ import webdb.storage.*;
  */
 
 
-public class EntityUsers extends AbstractEntity implements Entity
+public class EntityUsers extends Entity
 {
-               private static int instances;
 
                public EntityUsers()
                {
                        super();
-                               instances++;
                }
 
                public EntityUsers(StorageObject theStorage) {
@@ -32,11 +30,6 @@ public class EntityUsers extends AbstractEntity implements Entity
                        setStorage(theStorage);
                }
 
-       public void finalize() {
-    instances--;
-    super.finalize();
-  }
-
        // Methods
 
        public boolean isAdmin()