[Bedework-commit] calendarapi r743 - trunk/calsvc/src/org/bedework/calsvc/directory

[svnadmin at bedework.org]

Author: douglm
Date: 2008-11-14 10:31:34 -0500 (Fri, 14 Nov 2008)
New Revision: 743

Modified:
   trunk/calsvc/src/org/bedework/calsvc/directory/UserAuthUWDbImpl.java
Log:
Fix updating of auth user prefs. They are now a component part of the authuser class

Modified: trunk/calsvc/src/org/bedework/calsvc/directory/UserAuthUWDbImpl.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/directory/UserAuthUWDbImpl.java	2008-11-14 06:38:56 UTC (rev 742)
+++ trunk/calsvc/src/org/bedework/calsvc/directory/UserAuthUWDbImpl.java	2008-11-14 15:31:34 UTC (rev 743)
@@ -404,45 +404,15 @@
   }
 
   protected void addPrefs(BwAuthUser val) throws CalFacadeException {
-    BwAuthUserPrefs prefs = val.getPrefs();
-    getSess().saveOrUpdate(prefs);
+    getSess().saveOrUpdate(val);
   }
 
-  /*
-  protected void getPrefs(BwAuthUser au) throws CalFacadeException {
-    int id = au.getUser().getId();
-
-    HibSession sess = getSess();
-    BwAuthUserPrefs aup;
-
-    Object o = sess.get(BwAuthUserPrefs.class, id);
-    if (o != null) {
-      aup = (BwAuthUserPrefs)o;
-    } else {
-      StringBuilder q = new StringBuilder();
-
-      q.append("from ");
-      q.append(BwAuthUserPrefs.class.getName());
-      q.append(" as au where au.userid = :userid");
-
-      sess.createQuery(q.toString());
-
-      sess.setInt("userid", id);
-
-      aup = (BwAuthUserPrefs)sess.getUnique();
-    }
-
-    au.setPrefs(aup);
-  }
-  */
-
   /* ====================================================================
    *                       Preferences methods
    * ==================================================================== */
 
   public void updatePrefs(BwAuthUser user) throws CalFacadeException {
-    BwAuthUserPrefs prefs = user.getPrefs();
-    getSess().saveOrUpdate(prefs);
+    getSess().saveOrUpdate(user);
   }
 
   /*  ===================================================================