Revision: 4058
Author: seba.wagner
Date: Sun Aug 14 11:32:30 2011
Log: Refactor some code in Users<->Organization_User<->Organization
relation
http://code.google.com/p/openmeetings/source/detail?r=4058
Modified:
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Organisationmanagement.java
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Usermanagement.java
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java
/branches/dev/injection/src/app/org/openmeetings/app/remote/OrganisationService.java
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Organisationmanagement.java
Sun Aug 14 09:53:45 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Organisationmanagement.java
Sun Aug 14 11:32:30 2011
@@ -188,7 +188,7 @@
try {
// get all users
Query query = em
- .createQuery("select max(c.organisation_id) from Organisation c where
c.deleted = 'false'");
+ .createQuery("select max(c.organisation_id) from Organisation c where
c.deleted LIKE 'false'");
List<?> ll = query.getResultList();
log.debug("selectMaxFromOrganisations" + ll.get(0));
return (Long) ll.get(0);
@@ -211,17 +211,13 @@
public Long updateOrganisation(Long user_level, long organisation_id,
String orgname, long users_id) {
try {
+
Organisation org =
this.getOrganisationById(organisation_id);
org.setName(orgname);
org.setUpdatedby(users_id);
org.setUpdatetime(new Date());
- if (org.getOrganisation_id() == null) {
- em.persist(org);
- } else {
- if (!em.contains(org)) {
- em.merge(org);
- }
- }
+
+ em.merge(org);
return org.getOrganisation_id();
} catch (Exception err) {
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Usermanagement.java
Sun Aug 14 11:04:04 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Usermanagement.java
Sun Aug 14 11:32:30 2011
@@ -608,13 +608,18 @@
}
// log.info("USER " + us.getLastname());
- if (us.getUser_id() == null) {
- em.persist(us);
- } else {
- if (!em.contains(us)) {
- em.merge(us);
- }
- }
+ // What is this code good for? The Id
is already check in
+ // the initial
+ // if clause otherwise an update is not
possible
+ // if (us.getUser_id() == null) {
+ // em.persist(us);
+ // } else {
+ // if (!em.contains(us)) {
+ em.merge(us);
+
+ em.refresh(us);
+ // }
+ // }
return us.getUser_id();
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java
Sat Jul 23 04:28:08 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java
Sun Aug 14 11:32:30 2011
@@ -3,8 +3,6 @@
import java.io.Serializable;
import java.util.Date;
-
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -15,8 +13,6 @@
import javax.persistence.ManyToOne;
import javax.persistence.Table;
-
-
@Entity
@Table(name = "organisation_users")
public class Organisation_Users implements Serializable {
@@ -24,38 +20,38 @@
private static final long serialVersionUID = 7206870465903375817L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
-
- @Column(name="organisation_users_id")
+ @Column(name = "organisation_users_id")
private Long organisation_users_id;
-
+
@ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name="organisation_id")
+ @JoinColumn(name = "organisation_id")
private Organisation organisation;
-
- @Column(name="user_id")
+
+ @Column(name = "user_id")
private Long user_id;
- @Column(name="starttime")
+ @Column(name = "starttime")
private Date starttime;
- @Column(name="updatetime")
+ @Column(name = "updatetime")
private Date updatetime;
- @Column(name="deleted")
+ @Column(name = "deleted")
private String deleted;
- @Column(name="is_moderator")
+ @Column(name = "is_moderator")
private Boolean isModerator;
- @Column(name="comment_field")
+ @Column(name = "comment_field")
private String comment;
-
public Organisation getOrganisation() {
return organisation;
}
+
public void setOrganisation(Organisation organisation) {
this.organisation = organisation;
}
-
+
public Long getOrganisation_users_id() {
return organisation_users_id;
}
+
public void setOrganisation_users_id(Long organisation_users_id) {
this.organisation_users_id = organisation_users_id;
}
@@ -63,6 +59,7 @@
public Long getUser_id() {
return user_id;
}
+
public void setUser_id(Long user_id) {
this.user_id = user_id;
}
@@ -70,36 +67,39 @@
public Date getStarttime() {
return starttime;
}
+
public void setStarttime(Date starttime) {
this.starttime = starttime;
}
-
+
public Date getUpdatetime() {
return updatetime;
}
+
public void setUpdatetime(Date updatetime) {
this.updatetime = updatetime;
}
-
+
public String getDeleted() {
return deleted;
}
+
public void setDeleted(String deleted) {
this.deleted = deleted;
}
-
-
- public String getComment() {
+
+ public String getComment() {
return comment;
}
+
public void setComment(String comment) {
this.comment = comment;
}
-
-
+
public Boolean getIsModerator() {
return isModerator;
}
+
public void setIsModerator(Boolean isModerator) {
this.isModerator = isModerator;
}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/remote/OrganisationService.java
Sat Aug 13 04:54:44 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/remote/OrganisationService.java
Sun Aug 14 11:32:30 2011
@@ -100,7 +100,8 @@
try {
Long users_id = sessionManagement.checkSession(SID);
long user_level =
userManagement.getUserLevelByID(users_id);
- LinkedHashMap argObjectMap = (LinkedHashMap)
regObjectObj;
+ @SuppressWarnings("rawtypes")
+ LinkedHashMap<?, ?> argObjectMap = (LinkedHashMap)
regObjectObj;
long organisation_id = Long.valueOf(
argObjectMap.get("organisation_id").toString()).longValue();
if (organisation_id == 0) {
--
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.
