Revision: 4045
Author: solomax666
Date: Sat Aug 13 22:01:31 2011
Log: - UserContactsDaoImpl is corrected
http://code.google.com/p/openmeetings/source/detail?r=4045
Modified:
/branches/dev/injection/src/app/org/openmeetings/app/data/user/dao/UserContactsDaoImpl.java
/branches/dev/injection/src/app/org/openmeetings/app/remote/UserService.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java
/branches/dev/injection/src/test/org/openmeetings/test/dao/UserContactsDaoImplTest.java
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/data/user/dao/UserContactsDaoImpl.java
Sat Aug 13 21:43:12 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/data/user/dao/UserContactsDaoImpl.java
Sat Aug 13 22:01:31 2011
@@ -25,18 +25,6 @@
@Autowired
private Usermanagement userManagement;
- private static UserContactsDaoImpl instance = null;
-
- private UserContactsDaoImpl() {
- }
-
- public static synchronized UserContactsDaoImpl getInstance() {
- if (instance == null) {
- instance = new UserContactsDaoImpl();
- }
- return instance;
- }
-
public Long addUserContact(Long user_id, Long ownerId, Boolean pending,
String hash) {
try {
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/remote/UserService.java
Sat Aug 13 21:43:12 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/remote/UserService.java
Sat Aug 13 22:01:31 2011
@@ -89,6 +89,8 @@
private PrivateMessageFolderDaoImpl privateMessageFolderDao;
@Autowired
private UsersDaoImpl usersDao;
+ @Autowired
+ private UserContactsDaoImpl userContactsDao;
public ClientListManager getClientListManager() {
return clientListManager;
@@ -617,7 +619,7 @@
// users only
if
(AuthLevelmanagement.getInstance().checkUserLevel(user_level)) {
- Long countContacts =
UserContactsDaoImpl.getInstance()
+ Long countContacts = userContactsDao
.checkUserContacts(userToAdd_id, users_id);
if (countContacts != null && countContacts > 0)
{
@@ -630,7 +632,7 @@
CalendarPatterns
.getDateWithTimeByMiliSeconds(new Date()));
- Long userContactId =
UserContactsDaoImpl.getInstance()
+ Long userContactId = userContactsDao
.addUserContact(userToAdd_id,
users_id, true, hash);
Users user =
userManagement.getUserById(users_id);
@@ -715,7 +717,7 @@
// users only
if
(AuthLevelmanagement.getInstance().checkUserLevel(user_level)) {
- List<UserContacts> uList =
UserContactsDaoImpl.getInstance()
+ List<UserContacts> uList = userContactsDao
.getContactRequestsByUserAndStatus(users_id, true);
return uList;
@@ -735,7 +737,7 @@
// users only
if
(AuthLevelmanagement.getInstance().checkUserLevel(user_level)) {
- UserContacts userContact =
UserContactsDaoImpl.getInstance()
+ UserContacts userContact = userContactsDao
.getContactsByHash(hash);
if (userContact == null) {
@@ -769,7 +771,7 @@
// users only
if
(AuthLevelmanagement.getInstance().checkUserLevel(user_level)) {
- List<UserContacts> uList =
UserContactsDaoImpl.getInstance()
+ List<UserContacts> uList = userContactsDao
.getContactsByUserAndStatus(users_id, false);
return uList;
@@ -788,7 +790,7 @@
// users only
if
(AuthLevelmanagement.getInstance().checkUserLevel(user_level)) {
- UserContacts userContacts =
UserContactsDaoImpl.getInstance()
+ UserContacts userContacts = userContactsDao
.getUserContacts(userContactId);
if (userContacts == null) {
@@ -815,14 +817,14 @@
// users only
if
(AuthLevelmanagement.getInstance().checkUserLevel(user_level)) {
- UserContacts userContacts =
UserContactsDaoImpl.getInstance()
+ UserContacts userContacts = userContactsDao
.getUserContacts(userContactId);
if (userContacts == null) {
return -49;
}
- return
UserContactsDaoImpl.getInstance().deleteUserContact(
+ return userContactsDao.deleteUserContact(
userContactId);
}
@@ -840,7 +842,7 @@
// users only
if
(AuthLevelmanagement.getInstance().checkUserLevel(user_level)) {
- UserContacts userContacts =
UserContactsDaoImpl.getInstance()
+ UserContacts userContacts = userContactsDao
.getUserContacts(userContactId);
if (userContacts == null) {
@@ -854,13 +856,13 @@
if (pending) {
-
UserContactsDaoImpl.getInstance().updateContactStatus(
+ userContactsDao.updateContactStatus(
userContactId, false);
- userContacts =
UserContactsDaoImpl.getInstance()
+ userContacts = userContactsDao
.getUserContacts(userContactId);
-
UserContactsDaoImpl.getInstance().addUserContact(
+ userContactsDao.addUserContact(
userContacts.getOwner().getUser_id(), users_id,
false, "");
@@ -911,7 +913,7 @@
} else {
-
UserContactsDaoImpl.getInstance().deleteUserContact(
+ userContactsDao.deleteUserContact(
userContactId);
}
@@ -1444,7 +1446,7 @@
// users only
if
(AuthLevelmanagement.getInstance().checkUserLevel(user_level)) {
- List<UserContacts> uList =
UserContactsDaoImpl.getInstance()
+ List<UserContacts> uList = userContactsDao
.getContactsByUserAndStatus(users_id, false);
for (UserContacts userContact : uList) {
@@ -1474,12 +1476,12 @@
// users only
if
(AuthLevelmanagement.getInstance().checkUserLevel(user_level)) {
- UserContacts userContacts =
UserContactsDaoImpl.getInstance()
+ UserContacts userContacts = userContactsDao
.getUserContacts(userContactId);
userContacts.setShareCalendar(shareCalendar);
-
UserContactsDaoImpl.getInstance().updateContact(userContacts);
+ userContactsDao.updateContact(userContacts);
}
@@ -1543,8 +1545,7 @@
// users only
if
(AuthLevelmanagement.getInstance().checkUserLevel(user_level)) {
- return UserContactsDaoImpl.getInstance()
-
.getContactsByShareCalendar(users_id, true);
+ return
userContactsDao.getContactsByShareCalendar(users_id, true);
}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java
Sat Aug 13 21:43:12 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java
Sat Aug 13 22:01:31 2011
@@ -98,6 +98,8 @@
private PrivateMessagesDaoImpl privateMessagesDao;
@Autowired
private PrivateMessageFolderDaoImpl privateMessageFolderDao;
+ @Autowired
+ private UserContactsDaoImpl userContactsDao;
/*
* (non-Javadoc)
@@ -328,8 +330,7 @@
/*
* ##################### User Contacts
*/
- List<UserContacts> userContacts =
UserContactsDaoImpl
-
.getInstance().getUserContacts();
+ List<UserContacts> userContacts =
userContactsDao.getUserContacts();
if (privateMessageFolders != null) {
Document doc = this
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java
Sat Aug 13 21:43:12 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java
Sat Aug 13 22:01:31 2011
@@ -119,6 +119,8 @@
private RoomModeratorsDaoImpl roomModeratorsDao;
@Autowired
private FileExplorerItemDaoImpl fileExplorerItemDao;
+ @Autowired
+ private UserContactsDaoImpl userContactsDao;
private final HashMap<Long, Long> usersMap = new HashMap<Long, Long>();
private final HashMap<Long, Long> organisationsMap = new HashMap<Long,
Long>();
@@ -1287,13 +1289,11 @@
for (UserContacts uc : ucList) {
Long userContactId = uc.getUserContactId();
- UserContacts storedUC =
UserContactsDaoImpl.getInstance()
- .getUserContacts(userContactId);
+ UserContacts storedUC =
userContactsDao.getUserContacts(userContactId);
if (storedUC == null) {
uc.setUserContactId(0);
- Long newId = UserContactsDaoImpl.getInstance()
- .addUserContactObj(uc);
+ Long newId =
userContactsDao.addUserContactObj(uc);
this.userContactsMap.put(userContactId, newId);
}
}
=======================================
---
/branches/dev/injection/src/test/org/openmeetings/test/dao/UserContactsDaoImplTest.java
Fri Aug 12 12:28:51 2011
+++
/branches/dev/injection/src/test/org/openmeetings/test/dao/UserContactsDaoImplTest.java
Sat Aug 13 22:01:31 2011
@@ -8,20 +8,18 @@
public class UserContactsDaoImplTest extends AbstractTestCase {
@Autowired
private Usermanagement userManagement;
+ @Autowired
+ private UserContactsDaoImpl userContactsDao;
public UserContactsDaoImplTest(String name){
super(name);
}
final public void testUserContactsDaoImpl() throws Exception {
-
- // Get instance
- UserContactsDaoImpl contactDaoImpl =
UserContactsDaoImpl.getInstance();
-
- assertNotNull("Cann't access to contacts dao implimentation",
contactDaoImpl);
- Long id = contactDaoImpl.addUserContact(1L, 1L, false, "");
+ assertNotNull("Cann't access to contacts dao implimentation",
userContactsDao);
+ Long id = userContactsDao.addUserContact(1L, 1L, false, "");
assertTrue("New contact cann't added", id > 0);
- UserContacts userContact = contactDaoImpl.getUserContacts(id);
+ UserContacts userContact = userContactsDao.getUserContacts(id);
assertTrue("Contact should be the same with user",
userContact.getContact().equals(userManagement.getUserById(id)));
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
