You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2012/07/22 17:52:26 UTC
svn commit: r1364338 [2/2] - in
/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings:
app/data/basic/ app/data/basic/dao/ app/data/calendar/daos/
app/data/conference/ app/data/conference/dao/ app/data/file/dao/
app/data/flvrecord/ app/data/u...
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Configuration.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Configuration.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Configuration.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Configuration.java Sun Jul 22 15:52:23 2012
@@ -37,8 +37,8 @@ import javax.persistence.Transient;
@Entity
@NamedQueries({
- @NamedQuery(name = "getConfigurationByKey", query = "SELECT c FROM Configuration c WHERE c.conf_key = :conf_key and c.deleted = 'false'")
- , @NamedQuery(name = "getConfigurationsByKeys", query = "SELECT c FROM Configuration c WHERE c.conf_key IN :conf_keys and c.deleted = 'false'")
+ @NamedQuery(name = "getConfigurationByKey", query = "SELECT c FROM Configuration c WHERE c.conf_key = :conf_key and c.deleted = false")
+ , @NamedQuery(name = "getConfigurationsByKeys", query = "SELECT c FROM Configuration c WHERE c.conf_key IN :conf_keys and c.deleted = false")
})
@Table(name = "configuration")
public class Configuration implements Serializable {
@@ -60,7 +60,7 @@ public class Configuration implements Se
@Column(name="comment_field", length=2048)
private String comment;
@Column(name="deleted")
- private String deleted;
+ private boolean deleted;
@Column(name="user_id")
private Long user_id;
@@ -109,10 +109,10 @@ public class Configuration implements Se
this.updatetime = updatetime;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorType.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorType.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorType.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorType.java Sun Jul 22 15:52:23 2012
@@ -43,7 +43,7 @@ public class ErrorType implements Serial
@Column(name = "updatetime")
private Date updatetime;
@Column(name = "deleted")
- private String deleted;
+ private boolean deleted;
public Long getErrortype_id() {
return errortype_id;
@@ -69,11 +69,11 @@ public class ErrorType implements Serial
this.updatetime = updatetime;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorValues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorValues.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorValues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorValues.java Sun Jul 22 15:52:23 2012
@@ -43,7 +43,7 @@ public class ErrorValues implements Seri
@Column(name = "updatetime")
private Date updatetime;
@Column(name = "deleted")
- private String deleted;
+ private boolean deleted;
public Long getErrorvalues_id() {
return errorvalues_id;
@@ -69,11 +69,11 @@ public class ErrorValues implements Seri
this.updatetime = updatetime;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/LdapConfig.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/LdapConfig.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/LdapConfig.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/LdapConfig.java Sun Jul 22 15:52:23 2012
@@ -65,7 +65,7 @@ public class LdapConfig implements Seria
@JoinColumn(name="updatedby_id", updatable=true, insertable=true)
public Users updatedby;
@Column(name="deleted")
- private String deleted;
+ private boolean deleted;
public long getLdapConfigId() {
return ldapConfigId;
@@ -137,10 +137,10 @@ public class LdapConfig implements Seria
this.updatedby = updatedby;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Naviglobal.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Naviglobal.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Naviglobal.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Naviglobal.java Sun Jul 22 15:52:23 2012
@@ -42,10 +42,10 @@ import org.openmeetings.app.persistence.
@NamedQueries({
@NamedQuery(name = "getNavigation", query = "SELECT DISTINCT ng from Naviglobal ng "
+ "LEFT JOIN ng.mainnavi nm "
- + "WHERE nm.deleted LIKE 'false' "
+ + "WHERE nm.deleted = false "
+ "AND ng.level_id <= :level_id "
+ "AND nm.level_id <= :level_id "
- + "AND ng.deleted LIKE 'false' "
+ + "AND ng.deleted = false "
+ "order by ng.naviorder, nm.naviorder"),
@NamedQuery(name = "getNavigationById", query = "SELECT ng from Naviglobal ng WHERE ng.global_id = :global_id") })
@Table(name = "naviglobal")
@@ -77,7 +77,7 @@ public class Naviglobal implements Seria
@Column(name = "level_id")
private Long level_id;
@Column(name = "deleted")
- private String deleted;
+ private boolean deleted;
@Column(name = "fieldvalues_id")
private Long fieldvalues_id;
@Column(name = "tooltip_fieldvalues_id")
@@ -154,11 +154,11 @@ public class Naviglobal implements Seria
this.updatetime = updatetime;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Navimain.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Navimain.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Navimain.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Navimain.java Sun Jul 22 15:52:23 2012
@@ -67,7 +67,7 @@ public class Navimain implements Seriali
@Column(name="fieldvalues_id")
private Long fieldvalues_id;
@Column(name="deleted")
- private String deleted;
+ private boolean deleted;
@Transient
private Fieldlanguagesvalues label;
@Transient
@@ -151,10 +151,10 @@ public class Navimain implements Seriali
this.updatetime = updatetime;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/Appointment.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/Appointment.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/Appointment.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/Appointment.java Sun Jul 22 15:52:23 2012
@@ -96,7 +96,7 @@ public class Appointment implements Seri
@Column(name = "updatetime")
private Date updatetime;
@Column(name = "deleted")
- private String deleted;
+ private boolean deleted;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "remind_id", nullable = true)
private AppointmentReminderTyps remind;
@@ -232,11 +232,11 @@ public class Appointment implements Seri
this.updatetime = updatetime;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/AppointmentCategory.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/AppointmentCategory.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/AppointmentCategory.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/AppointmentCategory.java Sun Jul 22 15:52:23 2012
@@ -57,7 +57,7 @@ public class AppointmentCategory impleme
@Column(name="updatetime")
private Date updatetime;
@Column(name="deleted")
- private String deleted;
+ private boolean deleted;
@Lob
@Column(name="comment_field", length=2048)
private String comment;
@@ -97,10 +97,10 @@ public class AppointmentCategory impleme
this.updatetime = updatetime;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/AppointmentReminderTyps.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/AppointmentReminderTyps.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/AppointmentReminderTyps.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/AppointmentReminderTyps.java Sun Jul 22 15:52:23 2012
@@ -58,7 +58,7 @@ public class AppointmentReminderTyps imp
@Column(name="updatetime")
private Date updatetime;
@Column(name="deleted")
- private String deleted;
+ private boolean deleted;
public Long getTypId() {
return typId;
@@ -95,10 +95,10 @@ public class AppointmentReminderTyps imp
this.updatetime = updatetime;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/MeetingMember.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/MeetingMember.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/MeetingMember.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/MeetingMember.java Sun Jul 22 15:52:23 2012
@@ -70,7 +70,7 @@ public class MeetingMember implements Se
@Column(name="updatetime")
private Date updatetime;
@Column(name="deleted")
- private Boolean deleted;
+ private boolean deleted;
@Column(name="invitor")
private Boolean invitor;
@@ -170,10 +170,10 @@ public class MeetingMember implements Se
this.updatetime = updatetime;
}
- public Boolean getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(Boolean deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation.java Sun Jul 22 15:52:23 2012
@@ -38,7 +38,7 @@ import javax.persistence.Table;
, @NamedQuery(name="getAnyOrganisationById",
query="SELECT c FROM Organisation AS c WHERE c.organisation_id = :organisation_id")
, @NamedQuery(name="getOrganisationsByUserId",
- query="SELECT ou.organisation FROM Users u, IN(u.organisation_users) ou WHERE u.deleted = 'false' AND u.user_id = :user_id")
+ query="SELECT ou.organisation FROM Users u, IN(u.organisation_users) ou WHERE u.deleted = false AND u.user_id = :user_id")
})
@Table(name = "organisation")
public class Organisation implements Serializable {
@@ -65,7 +65,7 @@ public class Organisation implements Ser
private Date updatetime;
@Column(name="deleted")
- private String deleted;
+ private boolean deleted;
public Long getInsertedby() {
@@ -111,10 +111,10 @@ public class Organisation implements Ser
this.updatetime = updatetime;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java Sun Jul 22 15:52:23 2012
@@ -36,9 +36,9 @@ import javax.persistence.Table;
@Entity
@NamedQueries({
@NamedQuery(name="selectMaxUsersByOrganisationId",
- query="SELECT COUNT(c.organisation_users_id) FROM Organisation_Users c WHERE c.deleted = 'false' AND c.organisation.organisation_id = :organisation_id")
+ query="SELECT COUNT(c.organisation_users_id) FROM Organisation_Users c WHERE c.deleted = false AND c.organisation.organisation_id = :organisation_id")
, @NamedQuery(name="getOrganisation_UserByUserAndOrganisation",
- query="SELECT ou FROM Users u, IN(u.organisation_users) ou WHERE u.deleted = 'false' AND u.user_id = :user_id AND ou.organisation.organisation_id = :organisation_id")
+ query="SELECT ou FROM Users u, IN(u.organisation_users) ou WHERE u.deleted = false AND u.user_id = :user_id AND ou.organisation.organisation_id = :organisation_id")
, @NamedQuery(name="deleteUsersFromOrganisation",
query="DELETE FROM Organisation_Users c WHERE c.organisation.organisation_id = :organisation_id")
})
@@ -65,7 +65,7 @@ public class Organisation_Users implemen
private Date updatetime;
@Column(name = "deleted")
- private String deleted;
+ private boolean deleted;
@Column(name = "is_moderator")
private Boolean isModerator;
@@ -110,11 +110,11 @@ public class Organisation_Users implemen
this.updatetime = updatetime;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/files/FileExplorerItem.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/files/FileExplorerItem.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/files/FileExplorerItem.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/files/FileExplorerItem.java Sun Jul 22 15:52:23 2012
@@ -73,7 +73,7 @@ public class FileExplorerItem implements
@Column(name="updated")
private Date updated;
@Column(name="deleted")
- private String deleted;
+ private boolean deleted;
@Column(name="filesize")
private Long fileSize;
@@ -182,10 +182,10 @@ public class FileExplorerItem implements
this.inserted = inserted;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecording.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecording.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecording.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecording.java Sun Jul 22 15:52:23 2012
@@ -89,7 +89,7 @@ public class FlvRecording implements Ser
@Column(name="updated")
private Date updated;
@Column(name="deleted")
- private String deleted;
+ private boolean deleted;
@Column(name="width")
private Integer width;
@@ -217,10 +217,10 @@ public class FlvRecording implements Ser
this.inserted = inserted;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingMetaData.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingMetaData.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingMetaData.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingMetaData.java Sun Jul 22 15:52:23 2012
@@ -69,7 +69,7 @@ public class FlvRecordingMetaData implem
@Column(name="updated")
private Date updated;
@Column(name="deleted")
- private String deleted;
+ private boolean deleted;
@Column(name="wav_audio_data")
private String wavAudioData;
@@ -152,10 +152,10 @@ public class FlvRecordingMetaData implem
this.inserted = inserted;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/invitation/Invitations.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/invitation/Invitations.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/invitation/Invitations.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/invitation/Invitations.java Sun Jul 22 15:52:23 2012
@@ -53,7 +53,7 @@ public class Invitations implements Seri
@Column(name = "updatetime")
private Date updatetime;
@Column(name = "deleted")
- private String deleted;
+ private boolean deleted;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "roomid", nullable = true)
@@ -145,11 +145,11 @@ public class Invitations implements Seri
this.updatetime = updatetime;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/FieldLanguage.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/FieldLanguage.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/FieldLanguage.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/FieldLanguage.java Sun Jul 22 15:52:23 2012
@@ -48,7 +48,7 @@ public class FieldLanguage implements Se
@Column(name="updatetime")
private Date updatetime;
@Column(name="deleted")
- private String deleted;
+ private boolean deleted;
@Column(name="rtl")
private Boolean rtl;
@Column(name="code")
@@ -86,10 +86,10 @@ public class FieldLanguage implements Se
this.updatetime = updatetime;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldlanguagesvalues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldlanguagesvalues.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldlanguagesvalues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldlanguagesvalues.java Sun Jul 22 15:52:23 2012
@@ -39,16 +39,16 @@ import javax.persistence.Table;
@Entity
@NamedQueries({
@NamedQuery(name = "allFieldLanguageValues", query = "SELECT flv FROM Fieldlanguagesvalues flv "
- + "WHERE flv.deleted LIKE 'false' "
- + " AND flv.fieldvalues.deleted LIKE 'false' "
+ + "WHERE flv.deleted = false "
+ + " AND flv.fieldvalues.deleted = false "
+ " AND flv.language_id = :language_id")
, @NamedQuery(name="allFieldValuesIds", query = "SELECT flv.fieldvalues_id FROM Fieldlanguagesvalues flv "
- + "WHERE flv.deleted LIKE 'false' "
- + " AND flv.fieldvalues.deleted LIKE 'false' "
+ + "WHERE flv.deleted = false "
+ + " AND flv.fieldvalues.deleted = false "
+ " AND flv.language_id = :language_id")
, @NamedQuery(name="allNotTranslatedValues", query = "SELECT flv FROM Fieldlanguagesvalues flv "
- + "WHERE flv.deleted LIKE 'false' "
- + " AND flv.fieldvalues.deleted LIKE 'false' "
+ + "WHERE flv.deleted = false "
+ + " AND flv.fieldvalues.deleted = false "
+ " AND flv.language_id = 1 AND flv.fieldvalues_id NOT IN (:id_list)")
})
@Table(name = "fieldlanguagesvalues")
@@ -68,7 +68,7 @@ public class Fieldlanguagesvalues implem
@Column(name="updatetime")
private Date updatetime;
@Column(name="deleted")
- private String deleted;
+ private boolean deleted;
@Lob
@Column(name="value")
private String value;
@@ -102,10 +102,10 @@ public class Fieldlanguagesvalues implem
this.updatetime = updatetime;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldvalues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldvalues.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldvalues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldvalues.java Sun Jul 22 15:52:23 2012
@@ -35,7 +35,7 @@ import javax.persistence.Transient;
@Entity
@NamedQueries({
- @NamedQuery(name = "getFieldCount", query = "SELECT COUNT(fv) FROM Fieldvalues flv WHERE flv.deleted LIKE 'false' ")
+ @NamedQuery(name = "getFieldCount", query = "SELECT COUNT(fv) FROM Fieldvalues flv WHERE flv.deleted = false ")
})
@Table(name = "fieldvalues")
public class Fieldvalues implements Serializable {
@@ -50,7 +50,7 @@ public class Fieldvalues implements Seri
@Column(name="updatetime")
private Date updatetime;
@Column(name="deleted")
- private String deleted;
+ private boolean deleted;
@OneToMany(fetch = FetchType.LAZY)
@JoinColumn(name="fieldvalues_id")
@@ -91,10 +91,10 @@ public class Fieldvalues implements Seri
this.updatetime = updatetime;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomModerators.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomModerators.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomModerators.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomModerators.java Sun Jul 22 15:52:23 2012
@@ -57,7 +57,7 @@ public class RoomModerators implements S
@Column(name = "updatetime")
private Date updatetime;
@Column(name = "deleted")
- private String deleted;
+ private boolean deleted;
public long getRoomModeratorsId() {
return roomModeratorsId;
@@ -95,10 +95,10 @@ public class RoomModerators implements S
this.updatetime = updatetime;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomTypes.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomTypes.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomTypes.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomTypes.java Sun Jul 22 15:52:23 2012
@@ -45,7 +45,7 @@ public class RoomTypes implements Serial
@Column(name="name")
private String name;
@Column(name = "deleted")
- private String deleted;
+ private boolean deleted;
public String getName() {
@@ -76,10 +76,10 @@ public class RoomTypes implements Serial
this.updatetime = updatetime;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms.java Sun Jul 22 15:52:23 2012
@@ -61,7 +61,7 @@ public class Rooms implements Serializab
@Column(name = "updatetime")
private Date updatetime;
@Column(name = "deleted")
- private String deleted;
+ private boolean deleted;
@Column(name = "ispublic")
private Boolean ispublic;
@Column(name = "numberOfPartizipants")
@@ -187,10 +187,10 @@ public class Rooms implements Serializab
this.updatetime = updatetime;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms_Organisation.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms_Organisation.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms_Organisation.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms_Organisation.java Sun Jul 22 15:52:23 2012
@@ -55,7 +55,7 @@ public class Rooms_Organisation implemen
@Column(name = "updatetime")
private Date updatetime;
@Column(name = "deleted")
- private String deleted;
+ private boolean deleted;
public Organisation getOrganisation() {
return organisation;
@@ -92,10 +92,10 @@ public class Rooms_Organisation implemen
this.updatetime = updatetime;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Salutations.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Salutations.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Salutations.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Salutations.java Sun Jul 22 15:52:23 2012
@@ -47,15 +47,11 @@ public class Salutations implements Seri
@Column(name="updatetime")
private Date updatetime;
@Column(name="deleted")
- private String deleted;
+ private boolean deleted;
@Column(name="fieldvalues_id")
private Long fieldvalues_id;
@Transient
private Fieldlanguagesvalues label;
- public Salutations() {
- super();
- // TODO Auto-generated constructor stub
- }
public String getName() {
return name;
@@ -86,10 +82,10 @@ public class Salutations implements Seri
this.updatetime = updatetime;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Userdata.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Userdata.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Userdata.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Userdata.java Sun Jul 22 15:52:23 2012
@@ -54,12 +54,7 @@ public class Userdata implements Seriali
@Column(name = "comment_field")
private String comment;
@Column(name = "deleted")
- private String deleted;
-
- public Userdata() {
- super();
- // TODO Auto-generated constructor stub
- }
+ private boolean deleted;
public String getComment() {
return comment;
@@ -104,10 +99,10 @@ public class Userdata implements Seriali
this.updatetime = updatetime;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Userlevel.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Userlevel.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Userlevel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Userlevel.java Sun Jul 22 15:52:23 2012
@@ -46,13 +46,8 @@ public class Userlevel implements Serial
@Column(name="updatetime")
private Date updatetime;
@Column(name="deleted")
- private String deleted;
+ private boolean deleted;
- public Userlevel() {
- super();
- // TODO Auto-generated constructor stub
- }
-
public String getDescription() {
return description;
}
@@ -82,10 +77,10 @@ public class Userlevel implements Serial
this.updatetime = updatetime;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java Sun Jul 22 15:52:23 2012
@@ -51,7 +51,7 @@ import org.openmeetings.app.persistence.
@NamedQuery(name="getAllUsers",
query="SELECT u FROM Users u")
, @NamedQuery(name="getUsersByOrganisationId",
- query="SELECT u FROM Users u WHERE u.deleted = 'false' AND u.organisation_users.organisation.organisation_id = :organisation_id")
+ query="SELECT u FROM Users u WHERE u.deleted = false AND u.organisation_users.organisation.organisation_id = :organisation_id")
})
@Table(name = "users")
public class Users implements Serializable {
@@ -93,7 +93,7 @@ public class Users implements Serializab
@Column(name = "pictureuri")
private String pictureuri;
@Column(name = "deleted")
- private String deleted;
+ private boolean deleted;
@Column(name = "language_id")
private Long language_id;
@Column(name = "resethash")
@@ -322,11 +322,11 @@ public class Users implements Serializab
this.updatetime = updatetime;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/LanguageService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/LanguageService.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/LanguageService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/LanguageService.java Sun Jul 22 15:52:23 2012
@@ -127,7 +127,7 @@ public class LanguageService {
if (langName.length() == 0)
return new Long(-30);
return fieldLanguageDaoImpl.updateFieldLanguage(language_id,
- langName, code, "false");
+ langName, code, false);
}
return null;
}
@@ -137,7 +137,7 @@ public class LanguageService {
Long user_level = userManagement.getUserLevelByID(users_id);
if (authLevelManagement.checkAdminLevel(user_level)) {
return fieldLanguageDaoImpl.updateFieldLanguage(language_id, "",
- "", "true");
+ "", true);
}
return null;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/UserImport.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/UserImport.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/UserImport.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/UserImport.java Sun Jul 22 15:52:23 2012
@@ -81,7 +81,7 @@ public class UserImport {
.getText()));
us.setAvailible(Integer.valueOf(
itemUsers.element("availible").getText()).intValue());
- us.setDeleted(itemUsers.element("deleted").getText());
+ us.setDeleted(Boolean.valueOf(itemUsers.element("deleted").getText()));
us.setFirstname(itemUsers.element("firstname").getText());
us.setLastname(itemUsers.element("lastname").getText());
us.setLogin(itemUsers.element("login").getText());
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FLVRecordingReturn.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FLVRecordingReturn.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FLVRecordingReturn.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FLVRecordingReturn.java Sun Jul 22 15:52:23 2012
@@ -48,7 +48,7 @@ public class FLVRecordingReturn {
private Long insertedBy;
private Date inserted;
private Date updated;
- private String deleted;
+ private boolean deleted;
private Integer width;
private Integer height;
@@ -248,11 +248,11 @@ public class FLVRecordingReturn {
this.updated = updated;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/cli/Admin.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/cli/Admin.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/cli/Admin.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/cli/Admin.java Sun Jul 22 15:52:23 2012
@@ -455,7 +455,7 @@ public class Admin {
} else {
invalid += pSize;
}
- } else if ("true".equals(u.getDeleted())) {
+ } else if (u.getDeleted()) {
if (cleanup) {
FileHelper.removeRec(profile);
} else {
@@ -465,7 +465,7 @@ public class Admin {
}
long missing = 0;
for (Users u : udao.getAllUsersDeleted()) {
- if (!"true".equals(u.getDeleted()) && !new File(OmFileHelper.getUploadProfilesUserDir(u.getUser_id()), u.getPictureuri()).exists()) {
+ if (!u.getDeleted() && !new File(OmFileHelper.getUploadProfilesUserDir(u.getUser_id()), u.getPictureuri()).exists()) {
missing++;
}
}
@@ -497,7 +497,7 @@ public class Admin {
} else {
invalid += fSize;
}
- } else if ("true".equals(item.getDeleted())) {
+ } else if (item.getDeleted()) {
if (cleanup) {
FileHelper.removeRec(f);
} else {
@@ -507,7 +507,7 @@ public class Admin {
}
missing = 0;
for (FileExplorerItem item : fileDao.getFileExplorerItems()) {
- if (!"true".equals(item.getDeleted()) && !new File(files, item.getFileHash()).exists()) {
+ if (!item.getDeleted() && !new File(files, item.getFileHash()).exists()) {
missing++;
}
}
@@ -590,11 +590,11 @@ public class Admin {
System.exit(0);
}
- private void checkRecordingFile(File hibernateDir, String name, String deleted, long[] params, boolean cleanup) {
+ private void checkRecordingFile(File hibernateDir, String name, boolean deleted, long[] params, boolean cleanup) {
File flv = name != null ? new File(hibernateDir, name) : null;
if (flv != null) {
if (flv.exists() && flv.isFile()) {
- if ("true".equals(deleted)) {
+ if (deleted) {
params[0] += flv.length();
if (cleanup) {
FileHelper.removeRec(flv);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupExport.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupExport.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupExport.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupExport.java Sun Jul 22 15:52:23 2012
@@ -1287,7 +1287,7 @@ public class BackupExport {
room_organisation.addElement("rooms_organisation_id").addCDATA(
formatString("" + roomOrg.getRooms_organisation_id()));
room_organisation.addElement("organisation_id").addCDATA(
- "true".equals(roomOrg.getDeleted()) ? "0" :
+ roomOrg.getDeleted() ? "0" :
formatString(""
+ roomOrg.getOrganisation().getOrganisation_id()));
if (roomOrg.getRoom() != null) {
@@ -1639,7 +1639,7 @@ public class BackupExport {
cfgElem.addElement("comment").addCDATA(formatString("" + cfg.getComment()));
cfgElem.addElement("key").addCDATA(formatString(cfg.getConf_key()));
cfgElem.addElement("value").addCDATA(formatString(cfg.getConf_value()));
- cfgElem.addElement("deleted").addCDATA(formatString(cfg.getDeleted()));
+ cfgElem.addElement("deleted").addCDATA(formatString("" + cfg.getDeleted()));
cfgElem.addElement("created").addCDATA(formatString(CalendarPatterns.getExportDate(cfg.getStarttime())));
cfgElem.addElement("updated").addCDATA(formatString(CalendarPatterns.getExportDate(cfg.getUpdatetime())));
cfgElem.addElement("user_id").addCDATA(formatString("" + cfg.getUser_id()));
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java Sun Jul 22 15:52:23 2012
@@ -715,7 +715,7 @@ public class BackupImportController exte
}
cfg.setConf_value(cfgElem.elementText("value"));
cfg.setUpdatetime(new Date());
- cfg.setDeleted(cfgElem.elementText("deleted"));
+ cfg.setDeleted(Boolean.valueOf(cfgElem.elementText("deleted")));
cfg.setComment(cfgElem.elementText("comment"));
cfgManagement.updateConfig(cfg);
} catch (Exception e) {
@@ -848,8 +848,8 @@ public class BackupImportController exte
.element("age").getText())));
us.setAvailible(importIntegerType(unformatString(itemUsers
.element("availible").getText())));
- us.setDeleted(unformatString(itemUsers.element(
- "deleted").getText()));
+ us.setDeleted(Boolean.valueOf(unformatString(itemUsers.element(
+ "deleted").getText())));
us.setFirstname(unformatString(itemUsers.element(
"firstname").getText()));
us.setLastname(unformatString(itemUsers.element(
@@ -858,7 +858,7 @@ public class BackupImportController exte
.getText()));
us.setPassword(unformatString(itemUsers.element("pass")
.getText()));
- us.setDeleted(itemUsers.element("deleted").getText());
+ us.setDeleted(Boolean.valueOf(itemUsers.element("deleted").getText()));
if (itemUsers.element("activatehash") != null) {
us.setActivatehash(unformatString(itemUsers
@@ -1035,8 +1035,8 @@ public class BackupImportController exte
Maps.ORGANISATIONS);
Boolean isModerator = importBooleanType(unformatString(organisationObject
.element("isModerator").getText()));
- String deleted = unformatString(organisationObject
- .element("deleted").getText());
+ boolean deleted = Boolean.valueOf(unformatString(organisationObject
+ .element("deleted").getText()));
Organisation_Users orgUser = new Organisation_Users();
orgUser.setOrganisation(organisationmanagement
@@ -1132,8 +1132,8 @@ public class BackupImportController exte
.element("alternateDownload").getText());
String comment = unformatString(flvObject.element(
"comment").getText());
- String deleted = unformatString(flvObject.element(
- "deleted").getText());
+ boolean deleted = Boolean.valueOf(unformatString(flvObject.element(
+ "deleted").getText()));
String fileHash = unformatString(flvObject.element(
"fileHash").getText());
String fileName = unformatString(flvObject.element(
@@ -1292,7 +1292,7 @@ public class BackupImportController exte
flvrecordingmetadata.setRecordEnd(recordEnd1);
flvrecordingmetadata.setRecordStart(recordStart1);
flvrecordingmetadata.setUpdated(updated);
- flvrecordingmetadata.setDeleted("false");
+ flvrecordingmetadata.setDeleted(false);
flvRecording.getFlvRecordingMetaData().add(
flvrecordingmetadata);
@@ -1590,8 +1590,8 @@ public class BackupImportController exte
.element("organisation_id").getText()));
String name = unformatString(orgObject.element("name")
.getText());
- String deleted = unformatString(orgObject.element(
- "deleted").getText());
+ boolean deleted = Boolean.valueOf(unformatString(orgObject.element(
+ "deleted").getText()));
Organisation organisation = new Organisation();
organisation.setName(name);
@@ -1674,7 +1674,7 @@ public class BackupImportController exte
.element("email").getText());
String phone = appointmentsObject.element("phone") == null ? "" :
unformatString(appointmentsObject.element("phone").getText());
- Boolean deleted = importBooleanType(unformatString(appointmentsObject
+ boolean deleted = importBooleanType(unformatString(appointmentsObject
.element("deleted").getText()));
Boolean invitor = importBooleanType(unformatString(appointmentsObject
.element("invitor").getText()));
@@ -1830,8 +1830,8 @@ public class BackupImportController exte
.parseImportDate(unformatString(appointmentsObject
.element("appointmentEndtime")
.getText()));
- String deleted = unformatString(appointmentsObject
- .element("deleted").getText());
+ boolean deleted = Boolean.valueOf(unformatString(appointmentsObject
+ .element("deleted").getText()));
Long typId = importLongType(unformatString(appointmentsObject
.element("typId").getText()));
Boolean isDaily = importBooleanType(unformatString(appointmentsObject
@@ -1944,8 +1944,8 @@ public class BackupImportController exte
importLongType(unformatString(orgRoomObject
.element("rooms_id").getText())),
Maps.ROOMS);
- String deleted = unformatString(orgRoomObject.element(
- "deleted").getText());
+ boolean deleted = Boolean.valueOf(unformatString(orgRoomObject.element(
+ "deleted").getText()));
Rooms_Organisation rooms_Organisation = new Rooms_Organisation();
rooms_Organisation
@@ -1990,8 +1990,8 @@ public class BackupImportController exte
.element("rooms_id").getText()));
String name = unformatString(roomObject.element("name")
.getText());
- String deleted = unformatString(roomObject.element(
- "deleted").getText());
+ boolean deleted = Boolean.valueOf(unformatString(roomObject.element(
+ "deleted").getText()));
String comment = unformatString(roomObject.element(
"comment").getText());
Long numberOfPartizipants = importLongType(unformatString((roomObject
@@ -2199,7 +2199,7 @@ public class BackupImportController exte
Boolean is_supermoderator = importBooleanType(unformatString(room_moderator
.element("is_supermoderator").getText()));
- roomModerators.setDeleted("false");
+ roomModerators.setDeleted(false);
roomModerators.setRoomId(getNewId(rooms_id,
Maps.ROOMS));
roomModerators.setUser(userManagement
@@ -2297,8 +2297,8 @@ public class BackupImportController exte
Date updated = CalendarPatterns
.parseImportDate(unformatString(fileExplorerItemObj
.element("updated").getText()));
- String deleted = unformatString(fileExplorerItemObj
- .element("deleted").getText());
+ boolean deleted = Boolean.valueOf(unformatString(fileExplorerItemObj
+ .element("deleted").getText()));
Long fileSize = importLongType(unformatString(fileExplorerItemObj
.element("fileSize").getText()));
Integer flvWidth = importIntegerType(unformatString(fileExplorerItemObj
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Export.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Export.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Export.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Export.java Sun Jul 22 15:52:23 2012
@@ -246,7 +246,7 @@ public class Export extends HttpServlet
user.addElement("age").setText(
CalendarPatterns.getDateByMiliSeconds(u.getAge()));
user.addElement("availible").setText(u.getAvailible().toString());
- user.addElement("deleted").setText(u.getDeleted());
+ user.addElement("deleted").setText("" + u.getDeleted());
user.addElement("firstname").setText(u.getFirstname());
user.addElement("lastname").setText(u.getLastname());
user.addElement("login").setText(u.getLogin());
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java Sun Jul 22 15:52:23 2012
@@ -94,7 +94,7 @@ public abstract class AbstractOpenmeetin
ap.setAppointmentEndtime(appointmentend);
ap.setAppointmentDescription("appointmentDescription");
ap.setStarttime(new Date());
- ap.setDeleted("false");
+ ap.setDeleted(false);
ap.setIsDaily(false);
ap.setIsWeekly(false);
ap.setIsMonthly(false);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/user/TestUserOrganisation.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/user/TestUserOrganisation.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/user/TestUserOrganisation.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/user/TestUserOrganisation.java Sun Jul 22 15:52:23 2012
@@ -41,7 +41,7 @@ public class TestUserOrganisation extend
private Users getValidUser() {
for (Users u : usersDao.getAllUsers()) {
- if ("false".equalsIgnoreCase(u.getDeleted()) && u.getOrganisation_users().size() > 0) {
+ if (!u.getDeleted() && u.getOrganisation_users().size() > 0) {
return u;
}
}