merged 1.1 branch into head

[mir.git] / source / mircoders / servlet / ServletModuleTopics.java

diff --git a/source/mircoders/servlet/ServletModuleTopics.java b/source/mircoders/servlet/ServletModuleTopics.java
index e7700d0..4b1fa1b 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleTopics.java
+++ b/source/mircoders/servlet/ServletModuleTopics.java
@@ -30,29 +30,15 @@
 
 package mircoders.servlet;
 
-import mir.log.LoggerWrapper;
-import mir.servlet.ServletModule;
+import mir.servlet.AdminServletModule;
 import mircoders.module.ModuleTopics;
 
 /**
- *
+ * Admin ServletModule for managing topics
  */
-
-public class ServletModuleTopics extends ServletModule
-{
-  private static ServletModuleTopics instance = new ServletModuleTopics();
-  public static ServletModule getInstance() { return instance; }
-
-  private ServletModuleTopics() {
-    super();
-    logger = new LoggerWrapper("ServletModule.Topics");
-
-    try {
-      definition = "topic";
-      mainModule = new ModuleTopics();
-    }
-    catch (Throwable e) {
-      logger.error("Initialization of ServletModuleTopics failed!: " + e.getMessage());
-    }
+public class ServletModuleTopics extends AdminServletModule {
+  public ServletModuleTopics() {
+    definition = "topic";
+    mainModule = new ModuleTopics();
   }
 }
\ No newline at end of file