cleanup / abuse system fix / prepping for a release

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

diff --git a/source/mircoders/servlet/ServletModuleFileEdit.java b/source/mircoders/servlet/ServletModuleFileEdit.java
index c8e0c2e..b74a600 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleFileEdit.java
+++ b/source/mircoders/servlet/ServletModuleFileEdit.java
@@ -37,7 +37,12 @@ import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.FilenameFilter;
 import java.io.StringWriter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -45,7 +50,7 @@ import mir.log.LoggerWrapper;
 import mir.servlet.ServletModule;
 import mir.servlet.ServletModuleExc;
 import mir.servlet.ServletModuleFailure;
-import mir.util.FileFunctions;
+import mir.util.FileRoutines;
 import mir.util.HTTPRequestParser;
 import mir.util.StringRoutines;
 import mir.util.URLBuilder;
@@ -56,7 +61,7 @@ import mir.util.URLBuilder;
  *  in the config file.
  *
  * @author $Author: zapata $
- * @version $Revision: 1.13.2.8 $ $Date: 2005/01/09 20:37:13 $
+ * @version $Revision: 1.13.2.10 $ $Date: 2005/08/21 17:09:24 $
  *
  */
 
@@ -72,14 +77,14 @@ public class ServletModuleFileEdit extends ServletModule
 
   private class FileEditDirectory {
     private String name;
-    private FileFunctions.RegExpFileFilter filter;
+    private FileRoutines.RegExpFileFilter filter;
     private File rootDirectory;
     private boolean recursive;
 
     public FileEditDirectory(String aName, String aRootDirectory, String aFilter, boolean aRecursive) {
       name = aName;
       rootDirectory = new File(aRootDirectory);
-      filter = new FileFunctions.RegExpFileFilter(aFilter);
+      filter = new FileRoutines.RegExpFileFilter(aFilter);
       recursive = aRecursive;
     }
 
@@ -87,7 +92,7 @@ public class ServletModuleFileEdit extends ServletModule
       return name;
     }
 
-    public FileFunctions.RegExpFileFilter getFilter() {
+    public FileRoutines.RegExpFileFilter getFilter() {
       return filter;
     }
 
@@ -133,7 +138,7 @@ public class ServletModuleFileEdit extends ServletModule
       }
     }
 
-    dirFilter = new FileFunctions.DirectoryFilter();
+    dirFilter = new FileRoutines.DirectoryFilter();
   }
 
   public List getEntries() {
@@ -239,14 +244,14 @@ public class ServletModuleFileEdit extends ServletModule
         aSubDirectory = "";
       }
 
-      responseData.put("filelist", FileFunctions.getDirectoryContentsAsList(dir, aDirectory.getFilter()));
+      responseData.put("filelist", FileRoutines.getDirectoryContentsAsList(dir, aDirectory.getFilter()));
 
       if (aDirectory.getRecursive()) {
         List dirs = new ArrayList();
         if (!dir.getCanonicalPath().equals(aDirectory.getRootDirectory().getCanonicalPath()))
           responseData.put("updir", new File(aSubDirectory).getParent());
 
-        dirs.addAll(FileFunctions.getDirectoryContentsAsList(dir, dirFilter));
+        dirs.addAll(FileRoutines.getDirectoryContentsAsList(dir, dirFilter));
 
         responseData.put("dirlist", dirs);
       }
@@ -265,8 +270,7 @@ public class ServletModuleFileEdit extends ServletModule
     }
   }
 
-  public void editFile(FileEditDirectory aDirectory, String aFileName, String aSubDirectory, HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc
-  {
+  public void editFile(FileEditDirectory aDirectory, String aFileName, String aSubDirectory, HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {
     try {
       File f = new File(new File(aDirectory.getRootDirectory(), aSubDirectory), aFileName);
 
@@ -289,9 +293,10 @@ public class ServletModuleFileEdit extends ServletModule
 
         // TODO read array
         char[] c = new char[4096];
-        int read;;
-        while ( (read=in.read(c)) != -1)
+        int read;
+        while ((read=in.read(c)) != -1) {
           out.write(c, 0, read);
+        }
         in.close();
         out.close();