multiple file-editable directories

[mir.git] / source / Mir.java

diff --git a/source/Mir.java b/source/Mir.java
index 4f90445..01af8f3 100755 (executable)
--- a/source/Mir.java
+++ b/source/Mir.java
@@ -18,13 +18,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with  any library licensed under the Apache Software License, 
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
- * (or with modified versions of the above that use the same license as the above), 
- * and distribute linked combinations including the two.  You must obey the 
- * GNU General Public License in all respects for all of the code used other than 
- * the above mentioned libraries.  If you modify this file, you may extend this 
- * exception to your version of the file, but you are not obligated to do so.  
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
  * If you do not wish to do so, delete this exception statement from your version.
  */
 
@@ -63,7 +63,7 @@ import mircoders.entity.EntityUsers;
 import mircoders.global.MirGlobal;
 import mircoders.module.ModuleMessage;
 import mircoders.module.ModuleUsers;
-import mircoders.servlet.ServletHelper;
+import mircoders.servlet.*;
 import mircoders.storage.DatabaseUsers;
 
 import org.apache.struts.util.MessageResources;
@@ -79,8 +79,8 @@ import freemarker.template.TemplateModel;
 /**
  * Mir.java - main servlet, that dispatches to servletmodules
  *
- * @author $Author: idfx $
- * @version $Id: Mir.java,v 1.45 2003/04/21 12:42:46 idfx Exp $
+ * @author $Author: zapata $
+ * @version $Id: Mir.java,v 1.46 2003/04/28 00:44:05 zapata Exp $
  *
  */
 public class Mir extends AbstractServlet {
@@ -462,6 +462,9 @@ public class Mir extends AbstractServlet {
              new CachingRewindableIterator(
                new EntityIteratorAdapter( "", "webdb_create desc", 10,
                  MirGlobal.localizer().dataModel().adapterModel(), "internalMessage", 10, 0)));
+
+      mergeData.put("fileeditentries", ((ServletModuleFileEdit) ServletModuleFileEdit.getInstance()).getEntries());
+
       mergeData.put("searchvalue", null);
       mergeData.put("searchfield", null);
       mergeData.put("searchispublished", null);