[GM-CVS] GatorMail/src/java/edu/ufl/osg/webmail/forms FolderForm.java,1.4,1.5 NewFolderForm.java,1.3,1.4

[Sandy M. <san...@us...>]

Update of /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/forms
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14024/src/java/edu/ufl/osg/webmail/forms

Modified Files:
	FolderForm.java NewFolderForm.java 
Log Message:
Applied most of Allison Moore's patch to add sorting to the mesage list.

Index: FolderForm.java
===================================================================
RCS file: /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/forms/FolderForm.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FolderForm.java	7 Oct 2004 18:00:51 -0000	1.4
--- FolderForm.java	1 Dec 2004 22:13:24 -0000	1.5
***************
*** 3,6 ****
--- 3,7 ----
   * Copyright (C) 2002, 2003 William A. McArthur, Jr.
   * Copyright (C) 2003 The Open Systems Group / University of Florida
+  * Copyright (C) 2004 Allison Moore
   *
   * GatorMail is free software; you can redistribute it and/or modify
***************
*** 28,32 ****
  import javax.servlet.http.HttpServletRequest;
  
- 
  /**
   * Basic Folder view form. This is extended by a number of other forms.
--- 29,32 ----
***************
*** 39,42 ****
--- 39,43 ----
      private static final Integer ZERO = new Integer(0);
      private static final Integer ONE = new Integer(1);
+     private static final String DATEDN = (String)"dateDN";
  
      /**
***************
*** 46,49 ****
--- 47,60 ----
  
      /**
+      * Holds value of property folderSelect.
+      */
+     private String folderSelect;
+ 
+     /**
+      * Holds value of property folder.
+      */
+     private String sort = DATEDN;
+ 
+     /**
       * Simple message filter to be applies to this folder.
       */
***************
*** 57,60 ****
--- 68,73 ----
      private Integer page = ONE;
  
+     private int size = 0;
+ 
      /**
       * Resets the <code>ActionForm</code> and then resets <code>folder</code> to
***************
*** 69,73 ****
--- 82,89 ----
          setFilter("");
          setFilterType(null);
+         setSort(DATEDN);
          setPage(ONE);
+         setFolderSelect("");
+ 
      }
  
***************
*** 98,101 ****
--- 114,125 ----
      }
  
+     public String getFolderSelect() {
+         return this.folderSelect;
+     }
+ 
+     public String getSort() {
+         return this.sort;
+     }
+ 
      /**
       * Setter for property folder.
***************
*** 107,110 ****
--- 131,142 ----
      }
  
+     public void setFolderSelect(final String folder) {
+         this.folderSelect = folder;
+     }
+ 
+     public void setSort(String sort) {
+         this.sort = sort;
+     }
+ 
      public String getFilter() {
          return filter;
***************
*** 148,153 ****
--- 180,193 ----
      }
  
+     public int getSize() {
+         return size;
+     }
+ 
      public void setPage(final Integer page) {
          this.page = page;
      }
+ 
+     public void setSize(final int size) {
+         this.size = size;
+     }
  }

Index: NewFolderForm.java
===================================================================
RCS file: /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/forms/NewFolderForm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NewFolderForm.java	23 Feb 2004 01:05:34 -0000	1.3
--- NewFolderForm.java	1 Dec 2004 22:13:24 -0000	1.4
***************
*** 3,6 ****
--- 3,7 ----
   * Copyright (C) 2002-2004 William A. McArthur, Jr.
   * Copyright (C) 2003 The Open Systems Group / University of Florida
+  * Copyright (C) 2004 Allison Moore
   *
   * GatorMail is free software; you can redistribute it and/or modify
***************
*** 27,31 ****
  import javax.servlet.http.HttpServletRequest;
  
- 
  /**
   * Form for creating/renaming a folder.
--- 28,31 ----
***************
*** 40,43 ****
--- 40,44 ----
      /** Holds value of property newFolder. */
      private String newFolder;
+     private String subFolder;
  
      /**
***************
*** 51,54 ****
--- 52,56 ----
          super.reset(mapping, request);
          setNewFolder(null);
+         setSubFolder(null);
      }
  
***************
*** 80,83 ****
--- 82,94 ----
  
      /**
+      * Getter for property subFolder.
+      *
+      * @return Value of property subFolder.
+      */
+     public String getSubFolder() {
+         return this.subFolder;
+     }
+ 
+     /**
       * Setter for property newFolder.
       *
***************
*** 87,89 ****
--- 98,109 ----
          this.newFolder = newFolder;
      }
+ 
+     /**
+      * Setter for property subFolder.
+      *
+      * @param subFolder New value of property subFolder.
+      */
+     public void setSubFolder(final String subFolder) {
+         this.subFolder = subFolder;
+     }
  }