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
/
DatabaseAudio.java
diff --git
a/source/mircoders/storage/DatabaseAudio.java
b/source/mircoders/storage/DatabaseAudio.java
index
bed4e44
..
0f7ce74
100755
(executable)
--- a/
source/mircoders/storage/DatabaseAudio.java
+++ b/
source/mircoders/storage/DatabaseAudio.java
@@
-35,14
+35,11
@@
import mir.entity.Entity;
import mir.log.LoggerWrapper;
import mir.misc.StringUtil;
import mir.storage.Database;
import mir.log.LoggerWrapper;
import mir.misc.StringUtil;
import mir.storage.Database;
-import mir.storage.StorageObject;
-import mir.storage.StorageObjectFailure;
-import freemarker.template.SimpleList;
+import mir.storage.DatabaseFailure;
-public class DatabaseAudio extends Database
implements StorageObject
{
+public class DatabaseAudio extends Database {
private static DatabaseAudio instance;
private static DatabaseAudio instance;
- private static SimpleList publisherPopupData;
// the following *has* to be sychronized cause this static method
// could get preemted and we could end up with 2 instances of DatabaseFoo..
// the following *has* to be sychronized cause this static method
// could get preemted and we could end up with 2 instances of DatabaseFoo..
@@
-54,37
+51,35
@@
public class DatabaseAudio extends Database implements StorageObject{
return instance;
}
return instance;
}
- private DatabaseAudio() throws
StorageObject
Failure {
+ private DatabaseAudio() throws
Database
Failure {
super();
logger = new LoggerWrapper("Database.Audio");
super();
logger = new LoggerWrapper("Database.Audio");
- hasTimestamp = true;
- theTable = "audio";
- theCoreTable = "media";
- theEntityClass = mircoders.entity.EntityAudio.class;
- }
+ mainTable = "audio";
- public SimpleList getPopupData() throws StorageObjectFailure {
- return getPopupData("title", true);
+ entityClass = mircoders.entity.EntityAudio.class;
}
}
- public void update(Entity theEntity) throws
StorageObject
Failure {
- String date = theEntity.getValue("date");
+ public void update(Entity theEntity) throws
Database
Failure {
+ String date = theEntity.get
Field
Value("date");
if (date == null) {
date = StringUtil.date2webdbDate(new GregorianCalendar());
if (date == null) {
date = StringUtil.date2webdbDate(new GregorianCalendar());
- theEntity.set
ValueForProperty
("date", date);
+ theEntity.set
FieldValue
("date", date);
}
super.update(theEntity);
}
}
super.update(theEntity);
}
- public String insert(Entity theEntity) throws
StorageObject
Failure {
- String date = theEntity.getValue("date");
+ public String insert(Entity theEntity) throws
Database
Failure {
+ String date = theEntity.get
Field
Value("date");
if (date == null) {
date = StringUtil.date2webdbDate(new GregorianCalendar());
if (date == null) {
date = StringUtil.date2webdbDate(new GregorianCalendar());
- theEntity.set
ValueForProperty
("date", date);
+ theEntity.set
FieldValue
("date", date);
}
return super.insert(theEntity);
}
}
return super.insert(theEntity);
}
+ protected String getPrimaryKeySequence() {
+ return "media_id_seq";
+ }
}
}