Author: bleny Date: 2010-12-23 15:08:24 +0000 (Thu, 23 Dec 2010) New Revision: 853 Log: remove useless method from entity Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java 2010-12-23 14:50:37 UTC (rev 852) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java 2010-12-23 15:08:24 UTC (rev 853) @@ -89,16 +89,4 @@ } return false; } - - @Override - public void addProfile(UserProfile userProfile) { - Collection<UserProfile> profiles = getUserProfile(); - - if (profiles == null) { - profiles = new ArrayList<UserProfile>(); - setUserProfile(profiles); - } - - profiles.add(userProfile); - } } Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java 2010-12-23 14:50:37 UTC (rev 852) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java 2010-12-23 15:08:24 UTC (rev 853) @@ -212,7 +212,7 @@ user1.setLogin("user1"); user1.setFirstName("Jean"); user1.setLastName("Michmuche"); - user1.addProfile(observerProfile); + user1.addUserProfile(observerProfile); user1.setCompany(company); user1.setActive(true); service.createUpdateUser(user1, true); @@ -221,7 +221,7 @@ user2.setLogin("user2"); user2.setFirstName("Jack"); user2.setLastName("Pot"); - user2.addProfile(adminProfile); + user2.addUserProfile(adminProfile); user2.setCompany(company); user2.setActive(true); service.createUpdateUser(user2, true); @@ -230,8 +230,8 @@ user3.setLogin("user3"); user3.setFirstName("Denis"); user3.setLastName("La Malice"); - user3.addProfile(coordinatorProfile2); - user3.addProfile(observerProfile2); + user3.addUserProfile(coordinatorProfile2); + user3.addUserProfile(observerProfile2); user3.setCompany(company); user3.setActive(false); service.createUpdateUser(user3, true); @@ -241,7 +241,7 @@ user4.setFirstName("Ben"); user4.setLastName("Hur"); // The coordinator is also an observer - user4.addProfile(coordinatorProfile); + user4.addUserProfile(coordinatorProfile); user4.setCompany(company2); user4.setActive(true); service.createUpdateUser(user4, true);