projects
/
mir.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
adding a form on the edit article pages that allows you to add an image attachment...
[mir.git]
/
source
/
Mir.java
diff --git
a/source/Mir.java
b/source/Mir.java
index
515d1ee
..
f3a0b79
100755
(executable)
--- a/
source/Mir.java
+++ b/
source/Mir.java
@@
-30,14
+30,11
@@
import mir.bundle.Bundle;
import mir.config.MirPropertiesConfiguration;
import mir.bundle.Bundle;
import mir.config.MirPropertiesConfiguration;
+import mir.log.LoggerWrapper;
import mir.servlet.*;
import mir.servlet.*;
-import mir.util.ExceptionFunctions;
import mir.util.StringRoutines;
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 mir.util.ExceptionFunctions;
+import multex.Failure;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
@@
-45,16
+42,15
@@
import javax.servlet.UnavailableException;
import javax.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
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 java.io.StringWriter;
import java.lang.reflect.Method;
import java.util.*;
-import multex.Failure;
+import mircoders.module.ModuleUsers;
+import mircoders.global.MirGlobal;
+import mircoders.servlet.ServletHelper;
+import mircoders.entity.EntityUsers;
-/**
- * Mir.java - main servlet, that dispatches to servletmodules
- */
public class Mir extends AbstractServlet {
private static ModuleUsers usersModule = null;
private final static Map servletModuleInstanceHash = new HashMap();
public class Mir extends AbstractServlet {
private static ModuleUsers usersModule = null;
private final static Map servletModuleInstanceHash = new HashMap();
@@
-279,9
+275,7
@@
public class Mir extends AbstractServlet {
throw new ServletModuleExc("*** error resolving classname for " + moduleName + " -- " + e.getMessage());
}
}
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) {
}
private void handleUserError(HttpServletRequest aRequest, HttpServletResponse aResponse, ServletModuleUserExc anException) {