cvs commit: jakarta-log4j/src/java/org/apache/log4j/lf5/viewer/configure ConfigurationManager.java MRUFileManager.java

bradm       2002/06/26 09:05:25

  Modified:    src/java/org/apache/log4j/lf5/viewer/configure Tag:
                        v1_2-branch ConfigurationManager.java
                        MRUFileManager.java
  Log:
  fixed minor bug in MRUFileManager and refactored file separators
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +1 -2      jakarta-log4j/src/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java
  
  Index: ConfigurationManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- ConfigurationManager.java	26 Apr 2002 15:48:43 -0000	1.1
  +++ ConfigurationManager.java	26 Jun 2002 16:05:25 -0000	1.1.2.1
  @@ -330,8 +330,7 @@
   
     protected String getFilename() {
       String home = System.getProperty("user.home");
  -    String sep = (home.startsWith(MRUFileManager.UNIX_SEPARATOR))
  -        ? MRUFileManager.UNIX_SEPARATOR : MRUFileManager.DOS_SEPARATOR;
  +    String sep = System.getProperty("file.separator");
   
       return home + sep + "lf5" + sep + CONFIG_FILE_NAME;
     }
  
  
  
  1.1.2.1   +3 -7      jakarta-log4j/src/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java
  
  Index: MRUFileManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- MRUFileManager.java	26 Apr 2002 15:48:43 -0000	1.1
  +++ MRUFileManager.java	26 Jun 2002 16:05:25 -0000	1.1.2.1
  @@ -29,8 +29,6 @@
     //--------------------------------------------------------------------------
     private static final String CONFIG_FILE_NAME = "mru_file_manager";
     private static final int DEFAULT_MAX_SIZE = 3;
  -  public static final String UNIX_SEPARATOR = "/";
  -  public static final String DOS_SEPARATOR = "\\";
   
     //--------------------------------------------------------------------------
     //   Protected Variables:
  @@ -74,7 +72,6 @@
         // do nothing
         e.printStackTrace();
       }
  -
     }
   
     /**
  @@ -112,7 +109,6 @@
       return null;
     }
   
  -
     /**
      * Adds a file name to the MRU file list.
      */
  @@ -168,7 +164,7 @@
      */
     public static void createConfigurationDirectory() {
       String home = System.getProperty("user.home");
  -    String sep = (home.startsWith(UNIX_SEPARATOR)) ? UNIX_SEPARATOR : DOS_SEPARATOR;
  +    String sep = System.getProperty("file.separator");
       File f = new File(home + sep + "lf5");
       if (!f.exists()) {
         try {
  @@ -253,7 +249,7 @@
   
     protected String getFilename() {
       String home = System.getProperty("user.home");
  -    String sep = (home.startsWith(UNIX_SEPARATOR)) ? UNIX_SEPARATOR : DOS_SEPARATOR;
  +    String sep = System.getProperty("file.separator");
   
       return home + sep + "lf5" + sep + CONFIG_FILE_NAME;
     }
  @@ -264,7 +260,7 @@
     protected void setMaxSize(int maxSize) {
       if (maxSize < _mruFileList.size()) {
         for (int i = 0; i < _mruFileList.size() - maxSize; i++) {
  -        _mruFileList.removeFirst();
  +        _mruFileList.removeLast();
         }
       }