[cvs] Expresso commit by lhamel: fix deprecated

JCorporate Ltd jcorp at jcorp2.servlets.net
Tue Oct 12 11:47:35 PDT 2004


Log Message:
-----------
fix deprecated

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj:
        DefaultUserInfo.java

Revision Data
-------------
Index: DefaultUserInfo.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/DefaultUserInfo.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/DefaultUserInfo.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/DefaultUserInfo.java -u -r1.45 -r1.46
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/DefaultUserInfo.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/DefaultUserInfo.java
@@ -1459,7 +1459,7 @@
         UserGroup primary = null;
 
         UserPreference pref = new UserPreference();
-        pref.setDataContext(user.getDBName());
+        pref.setDataContext(user.getDataContext());
         pref.setField(UserPreference.PREF_CODE, UserPreferenceDef.PRIMARY_GROUP_PREF);
         pref.setField(UserPreference.CLASS_NAME, UserPreferenceDef.ANY_CLASS);
         pref.setField(UserPreference.EXPUID, user.getUid());
@@ -1469,7 +1469,7 @@
             Vector groupNames = user.getGroups();
             if (groupNames.size() > 0) {
                 primary = new UserGroup();
-                primary.setDataContext(user.getDBName());
+                primary.setDataContext(user.getDataContext());
                 primary.setField(UserGroup.GROUP_NAME_FIELD,
                         (String) groupNames.get(0));
                 if (!primary.find()) {
@@ -1480,7 +1480,7 @@
             // have preference; we expect this to be a real group
             String primStr = pref.getField(UserPreference.PREF_VALUE);
             primary = new UserGroup();
-            primary.setDataContext(user.getDBName());
+            primary.setDataContext(user.getDataContext());
             primary.setField(UserGroup.GROUP_NAME_FIELD, primStr);
             if (!primary.find()) {
                 // unexpected


More information about the cvs mailing list