projects
/
mir.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing scaling images -> nullpointer, patch by yossarian
[mir.git]
/
source
/
mircoders
/
storage
/
DatabaseMediafolder.java
diff --git
a/source/mircoders/storage/DatabaseMediafolder.java
b/source/mircoders/storage/DatabaseMediafolder.java
index
01be686
..
d4d113e
100755
(executable)
--- a/
source/mircoders/storage/DatabaseMediafolder.java
+++ b/
source/mircoders/storage/DatabaseMediafolder.java
@@
-31,33
+31,20
@@
package mircoders.storage;
/**
package mircoders.storage;
/**
- * Title: Mir
- * Description: Ihre Beschreibung
- * Copyright: Copyright (c) 1999
- * Company:
- * @author
- * @version
+ *
*/
import mir.log.LoggerWrapper;
import mir.storage.Database;
*/
import mir.log.LoggerWrapper;
import mir.storage.Database;
-import mir.storage.StorageObject;
-import mir.storage.StorageObjectFailure;
-import freemarker.template.SimpleList;
-
-
-
-public class DatabaseMediafolder extends Database implements StorageObject{
+public class DatabaseMediafolder extends Database {
private static DatabaseMediafolder instance;
private static DatabaseMediafolder instance;
- // the following *has* to be sychronized cause this static method
- // could get preemted and we could end up with 2 instances of DatabaseFoo..
- // see the "Singletons with needles and thread" article at JavaWorld -mh
public synchronized static DatabaseMediafolder getInstance() {
if (instance == null) {
instance = new DatabaseMediafolder();
}
public synchronized static DatabaseMediafolder getInstance() {
if (instance == null) {
instance = new DatabaseMediafolder();
}
+
return instance;
}
return instance;
}
@@
-65,13
+52,6
@@
public class DatabaseMediafolder extends Database implements StorageObject{
super();
logger = new LoggerWrapper("Database.Mediafolder");
super();
logger = new LoggerWrapper("Database.Mediafolder");
-
- hasTimestamp = false;
- theTable="media_folder";
- }
-
- public SimpleList getPopupData() throws StorageObjectFailure {
- return getPopupData("name",true);
+ mainTable="media_folder";
}
}
-
}
}