some code cleanup. removed unnecessary semikolons, unused vars, etc.

[mir.git] / source / Mir.java

diff --git a/source/Mir.java b/source/Mir.java
index 515d1ee..8d29112 100755 (executable)
--- a/source/Mir.java
+++ b/source/Mir.java
@@ -28,28 +28,43 @@
  * If you do not wish to do so, delete this exception statement from your version.
  */
 
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.UnavailableException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionBindingEvent;
+import javax.servlet.http.HttpSessionBindingListener;
+
 import mir.bundle.Bundle;
 import mir.config.MirPropertiesConfiguration;
-import mir.servlet.*;
+import mir.log.LoggerWrapper;
+import mir.servlet.AbstractServlet;
+import mir.servlet.ServletModule;
+import mir.servlet.ServletModuleDispatch;
+import mir.servlet.ServletModuleExc;
+import mir.servlet.ServletModuleUserExc;
 import mir.util.ExceptionFunctions;
 import mir.util.StringRoutines;
-import mir.log.LoggerWrapper;
 import mircoders.entity.EntityUsers;
 import mircoders.global.MirGlobal;
 import mircoders.module.ModuleUsers;
 import mircoders.servlet.ServletHelper;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.UnavailableException;
-import javax.servlet.http.*;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.PrintStream;
-import java.io.StringWriter;
-import java.lang.reflect.Method;
-import java.util.*;
-
 import multex.Failure;
 
 /**
@@ -279,9 +294,7 @@ public class Mir extends AbstractServlet {
         throw new ServletModuleExc("*** error resolving classname for " + moduleName + " -- " + e.getMessage());
       }
     }
-    else {
-      return (ServletModule) servletModuleInstanceHash.get(moduleName);
-    }
+               return (ServletModule) servletModuleInstanceHash.get(moduleName);
   }
 
   private void handleUserError(HttpServletRequest aRequest, HttpServletResponse aResponse, ServletModuleUserExc anException) {