merged 1.1 branch into head

[mir.git] / source / mircoders / storage / DatabaseMediafolder.java

diff --git a/source/mircoders/storage/DatabaseMediafolder.java b/source/mircoders/storage/DatabaseMediafolder.java
index a9d3dd4..d4d113e 100755 (executable)
--- a/source/mircoders/storage/DatabaseMediafolder.java
+++ b/source/mircoders/storage/DatabaseMediafolder.java
@@ -36,15 +36,15 @@ package mircoders.storage;
 
 import mir.log.LoggerWrapper;
 import mir.storage.Database;
-import mir.storage.StorageObject;
 
-public class DatabaseMediafolder extends Database implements StorageObject{
+public class DatabaseMediafolder extends Database {
   private static DatabaseMediafolder instance;
 
   public synchronized static DatabaseMediafolder getInstance() {
     if (instance == null) {
       instance = new DatabaseMediafolder();
     }
+
     return instance;
   }
 
@@ -52,8 +52,6 @@ public class DatabaseMediafolder extends Database implements StorageObject{
     super();
 
     logger = new LoggerWrapper("Database.Mediafolder");
-
-    hasTimestamp = false;
     mainTable="media_folder";
   }
 }