[GM-CVS] GatorMail/src/java/edu/ufl/osg/webmail/actions FolderAction.java,1.3,1.4 PreferencesAction.java,1.3,1.4

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

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

Modified Files:
	FolderAction.java PreferencesAction.java 
Log Message:
Implements preferences for setting the junk threashold

Index: PreferencesAction.java
===================================================================
RCS file: /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/actions/PreferencesAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PreferencesAction.java	12 Apr 2004 19:10:40 -0000	1.3
--- PreferencesAction.java	19 Apr 2004 22:29:42 -0000	1.4
***************
*** 65,68 ****
--- 65,69 ----
              prefsForm.setImageUrl(prefs.getProperty("compose.X-Image-Url"));
              prefsForm.setMaxInactiveMultiplier(prefs.getProperty("session.maxInactive.multiplier"));
+             prefsForm.setJunkThreashold(prefs.getProperty("message.junk.threashold", "8"));
              if (prefs.getProperty("folder.list.threading") != null) {
                  prefsForm.setThreading(Boolean.valueOf(prefs.getProperty("folder.list.threading")));
***************
*** 111,114 ****
--- 112,123 ----
              }
  
+             final String junkThreashold = prefsForm.getJunkThreashold();
+             if (junkThreashold == null
+                     && prefs.getProperty("message.junk.threashold") != null) {
+                 prefs.remove("message.junk.threashold");
+             } else if (junkThreashold != null && !junkThreashold.equals(prefs.getProperty("message.junk.threashold"))) {
+                 prefs.setProperty("message.junk.threashold", junkThreashold);
+             }
+ 
              final Boolean threading = prefsForm.getThreading();
              if (threading == null && prefs.getProperty("folder.list.threading") != null) {

Index: FolderAction.java
===================================================================
RCS file: /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/actions/FolderAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FolderAction.java	19 Apr 2004 20:44:23 -0000	1.3
--- FolderAction.java	19 Apr 2004 22:29:42 -0000	1.4
***************
*** 155,159 ****
              prefetchThreadingMessageHeaders(messageList, folder);
          }
!         if (Integer.valueOf(prefs.getProperty("message.junk.threashold", "0")).intValue() > 0) {
              prefetchJunkMessageHeaders(messageList, folder);
          }
--- 155,159 ----
              prefetchThreadingMessageHeaders(messageList, folder);
          }
!         if (Integer.valueOf(prefs.getProperty("message.junk.threashold", "8")).intValue() > 0) {
              prefetchJunkMessageHeaders(messageList, folder);
          }