projects
/
mir.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.1 restoration
[mir.git]
/
source
/
mircoders
/
servlet
/
ServletModuleMediafolder.java
diff --git
a/source/mircoders/servlet/ServletModuleMediafolder.java
b/source/mircoders/servlet/ServletModuleMediafolder.java
index
d0195e6
..
4ca4ae6
100755
(executable)
--- a/
source/mircoders/servlet/ServletModuleMediafolder.java
+++ b/
source/mircoders/servlet/ServletModuleMediafolder.java
@@
-29,23
+29,20
@@
*/
package mircoders.servlet;
*/
package mircoders.servlet;
-/**
- *
- */
-
-import java.util.GregorianCalendar;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import mir.log.LoggerWrapper;
import mir.misc.StringUtil;
import mir.servlet.ServletModule;
import mir.log.LoggerWrapper;
import mir.misc.StringUtil;
import mir.servlet.ServletModule;
-import mircoders.global.MirGlobal;
import mircoders.module.ModuleMediafolder;
import mircoders.storage.DatabaseMediafolder;
import mircoders.module.ModuleMediafolder;
import mircoders.storage.DatabaseMediafolder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.GregorianCalendar;
+import java.util.Map;
+
+/**
+ *
+ */
public class ServletModuleMediafolder extends ServletModule
{
public static ServletModule getInstance() { return instance; }
public class ServletModuleMediafolder extends ServletModule
{
public static ServletModule getInstance() { return instance; }
@@
-56,9
+53,8
@@
public class ServletModuleMediafolder extends ServletModule
logger = new LoggerWrapper("ServletModule.Mediafolder");
try {
logger = new LoggerWrapper("ServletModule.Mediafolder");
try {
- model = MirGlobal.localizer().dataModel().adapterModel();
definition = "mediaFolder";
definition = "mediaFolder";
- mainModule = new ModuleMediafolder(
DatabaseMediafolder.getInstance()
);
+ mainModule = new ModuleMediafolder();
}
catch (Throwable t) {
logger.error("Failed to initialize ServletModuleMediafolder: " + t.toString());
}
catch (Throwable t) {
logger.error("Failed to initialize ServletModuleMediafolder: " + t.toString());