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 [1/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...
Author: solomax
Date: Sun Jul 22 15:52:23 2012
New Revision: 1364338
URL: http://svn.apache.org/viewvc?rev=1364338&view=rev
Log:
OPENMEETINGS-107 initial commit: all 'deleted' columns are turned to be of type boolean.
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Configurationmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/ErrorManagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/FieldLanguageDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Navimanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/LdapConfigDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentCategoryDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentReminderTypDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/MeetingMemberDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Invitationmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/dao/RoomModeratorsDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/file/dao/FileExplorerItemDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/FlvRecordingMetaDataDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Emailmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Organisationmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Salutationmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Statemanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/UserContactsDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/UsersDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/Adresses.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/States.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Configuration.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorType.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorValues.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/LdapConfig.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Naviglobal.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Navimain.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/Appointment.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/AppointmentCategory.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/AppointmentReminderTyps.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/calendar/MeetingMember.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/files/FileExplorerItem.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecording.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingMetaData.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/invitation/Invitations.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/FieldLanguage.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldlanguagesvalues.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldvalues.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomModerators.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomTypes.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms_Organisation.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Salutations.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Userdata.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Userlevel.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/LanguageService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/UserImport.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FLVRecordingReturn.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/cli/Admin.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupExport.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Export.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/user/TestUserOrganisation.java
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Configurationmanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Configurationmanagement.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Configurationmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Configurationmanagement.java Sun Jul 22 15:52:23 2012
@@ -195,7 +195,7 @@ public class Configurationmanagement {
CriteriaQuery<Configuration> cq = cb
.createQuery(Configuration.class);
Root<Configuration> c = cq.from(Configuration.class);
- Predicate condition = cb.equal(c.get("deleted"), "false");
+ Predicate condition = cb.equal(c.get("deleted"), false);
cq.where(condition);
cq.distinct(asc);
if (asc) {
@@ -223,7 +223,7 @@ public class Configurationmanagement {
log.debug("selectMaxFromConfigurations ");
// get all users
TypedQuery<Long> query = em
- .createQuery("select count(c.configuration_id) from Configuration c where c.deleted = 'false'", Long.class);
+ .createQuery("select count(c.configuration_id) from Configuration c where c.deleted = false", Long.class);
List<Long> ll = query.getResultList();
log.debug("selectMaxFromConfigurations" + ll.get(0));
return ll.get(0);
@@ -241,7 +241,7 @@ public class Configurationmanagement {
configuration.setConf_key(CONF_KEY);
configuration.setConf_value(CONF_VALUE);
configuration.setStarttime(new Date());
- configuration.setDeleted("false");
+ configuration.setDeleted(false);
configuration.setComment(comment);
if (USER_ID != null)
configuration.setUser_id(USER_ID);
@@ -269,7 +269,7 @@ public class Configurationmanagement {
log.info("add new Configuration");
conf.setConfiguration_id(null);
conf.setStarttime(new Date());
- conf.setDeleted("false");
+ conf.setDeleted(false);
return this.addConfig(conf);
} else {
log.info("update Configuration ID: "
@@ -280,7 +280,7 @@ public class Configurationmanagement {
conf2.setConf_key(conf.getConf_key());
conf2.setConf_value(conf.getConf_value());
conf2.setUser_id(users_id);
- conf2.setDeleted("false");
+ conf2.setDeleted(false);
conf2.setUpdatetime(new Date());
return this.updateConfig(conf2);
}
@@ -335,7 +335,7 @@ public class Configurationmanagement {
Configuration.class);
conf.setUsers(usersDao.getUser(users_id));
conf.setUpdatetime(new Date());
- conf.setDeleted("true");
+ conf.setDeleted(true);
Configuration conf2 = this.getConfByConfigurationId(3L,
conf.getConfiguration_id());
@@ -343,7 +343,7 @@ public class Configurationmanagement {
conf2.setConf_key(conf.getConf_key());
conf2.setConf_value(conf.getConf_value());
conf2.setUser_id(users_id);
- conf2.setDeleted("true");
+ conf2.setDeleted(true);
conf2.setUpdatetime(new Date());
this.updateConfig(conf2);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/ErrorManagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/ErrorManagement.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/ErrorManagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/ErrorManagement.java Sun Jul 22 15:52:23 2012
@@ -46,7 +46,7 @@ public class ErrorManagement {
ErrorType eType = new ErrorType();
eType.setErrortype_id(errortype_id);
eType.setStarttime(new Date());
- eType.setDeleted("false");
+ eType.setDeleted(false);
eType.setFieldvalues_id(fieldvalues_id);
eType = em.merge(eType);
Long newerrortype_id = eType.getErrortype_id();
@@ -62,7 +62,7 @@ public class ErrorManagement {
String hql = "select c from ErrorType as c "
+ "WHERE c.deleted <> :deleted ";
TypedQuery<ErrorType> query = em.createQuery(hql, ErrorType.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
List<ErrorType> ll = query.getResultList();
return ll;
} catch (Exception ex2) {
@@ -76,7 +76,7 @@ public class ErrorManagement {
String hql = "select c from ErrorType as c "
+ "WHERE c.deleted <> :deleted AND c.errortype_id = :errortype_id";
TypedQuery<ErrorType> query = em.createQuery(hql, ErrorType.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
query.setParameter("errortype_id", errortype_id);
return query.getSingleResult();
} catch (Exception ex2) {
@@ -91,7 +91,7 @@ public class ErrorManagement {
ErrorValues eValue = new ErrorValues();
eValue.setErrorvalues_id(errorvalues_id);
eValue.setErrortype_id(errortype_id);
- eValue.setDeleted("false");
+ eValue.setDeleted(false);
eValue.setStarttime(new Date());
eValue.setFieldvalues_id(fieldvalues_id);
eValue = em.merge(eValue);
@@ -139,7 +139,7 @@ public class ErrorManagement {
+ " AND c.deleted <> :deleted";
TypedQuery<ErrorValues> query = em.createQuery(hql, ErrorValues.class);
query.setParameter("errorvalues_id", errorvalues_id);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
ErrorValues e = null;
try {
e = query.getSingleResult();
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/FieldLanguageDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/FieldLanguageDaoImpl.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/FieldLanguageDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/FieldLanguageDaoImpl.java Sun Jul 22 15:52:23 2012
@@ -51,7 +51,7 @@ public class FieldLanguageDaoImpl {
FieldLanguage fl = new FieldLanguage();
fl.setLanguage_id((long)langId);
fl.setStarttime(new Date());
- fl.setDeleted("false");
+ fl.setDeleted(false);
fl.setName(langName);
fl.setRtl(langRtl);
fl.setCode(code);
@@ -80,7 +80,7 @@ public class FieldLanguageDaoImpl {
}
public Long updateFieldLanguage(Long language_id, String langName,
- String code, String deleted) {
+ String code, boolean deleted) {
try {
FieldLanguage fl = this.getFieldLanguageById(language_id);
fl.setUpdatetime(new Date());
@@ -113,7 +113,7 @@ public class FieldLanguageDaoImpl {
+ "WHERE c.deleted <> :deleted "
+ "AND c.language_id = :language_id";
TypedQuery<FieldLanguage> query = em.createQuery(hql, FieldLanguage.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
query.setParameter("language_id", language_id);
FieldLanguage fl = null;
try {
@@ -132,7 +132,7 @@ public class FieldLanguageDaoImpl {
String hql = "select c from FieldLanguage as c "
+ "WHERE c.deleted <> :deleted ";
TypedQuery<FieldLanguage> query = em.createQuery(hql, FieldLanguage.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
List<FieldLanguage> ll = query.getResultList();
return ll;
} catch (Exception ex2) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java Sun Jul 22 15:52:23 2012
@@ -330,7 +330,7 @@ public class Fieldmanagment {
flv.setValue(fieldvalue);
flv.setLanguage_id(language_id);
flv.setFieldvalues(fv);
- flv.setDeleted("false");
+ flv.setDeleted(false);
flv = em.merge(flv);
Long fieldlanguagesvaluesId = flv.getFieldlanguagesvalues_id();
@@ -365,7 +365,7 @@ public class Fieldmanagment {
fl.setFieldvalues_id(fieldvalues_id);
fl.setStarttime(new Date());
fl.setName(fieldName);
- fl.setDeleted("false");
+ fl.setDeleted(false);
return em.merge(fl);
} catch (Exception ex2) {
@@ -500,7 +500,7 @@ public class Fieldmanagment {
}
private Long selectMaxFromFieldsValues(String search) throws Exception {
- String queryLanguage = "select count(c.fieldvalues_id) from Fieldvalues c where c.deleted = 'false'";
+ String queryLanguage = "select count(c.fieldvalues_id) from Fieldvalues c where c.deleted = false";
if (search.length()>0) {
queryLanguage += " AND (c.name LIKE :searchStr " +
"OR c.fieldvalues_id = :fieldvalues_id)";
@@ -531,7 +531,7 @@ public class Fieldmanagment {
private List<Fieldvalues> getFieldsValues(int start, int max,
String orderby, boolean asc, String search) throws Exception {
- String queryLanguage = "select c from Fieldvalues c where c.deleted = 'false'";
+ String queryLanguage = "select c from Fieldvalues c where c.deleted = false";
if (search.length()>0) {
queryLanguage += " AND (c.name LIKE :searchStr " +
"OR c.fieldvalues_id = :fieldvalues_id)";
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Navimanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Navimanagement.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Navimanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Navimanagement.java Sun Jul 22 15:52:23 2012
@@ -94,7 +94,7 @@ public class Navimanagement {
public void addGlobalStructure(String action, int naviorder,
long fieldvalues_id, boolean isleaf, boolean isopen, long level_id,
- String name, String deleted, Long tooltip_fieldvalues_id) {
+ String name, boolean deleted, Long tooltip_fieldvalues_id) {
try {
Naviglobal ng = new Naviglobal();
ng.setAction(action);
@@ -120,7 +120,7 @@ public class Navimanagement {
public void addMainStructure(String action, String params, int naviorder,
long fieldvalues_id, boolean isleaf, boolean isopen, long level_id,
- String name, long global_id, String deleted,
+ String name, long global_id, boolean deleted,
Long tooltip_fieldvalues_id) {
try {
Naviglobal ng = getGlobalMenuEntry(global_id);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/LdapConfigDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/LdapConfigDaoImpl.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/LdapConfigDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/LdapConfigDaoImpl.java Sun Jul 22 15:52:23 2012
@@ -54,7 +54,7 @@ public class LdapConfigDaoImpl {
LdapConfig ldapConfig = new LdapConfig();
ldapConfig.setAddDomainToUserName(addDomainToUserName);
ldapConfig.setConfigFileName(configFileName);
- ldapConfig.setDeleted("false");
+ ldapConfig.setDeleted(false);
ldapConfig.setDomain(domain);
ldapConfig.setIsActive(isActive);
ldapConfig.setName(name);
@@ -85,7 +85,7 @@ public class LdapConfigDaoImpl {
public Long addLdapConfigByObject(LdapConfig ldapConfig) {
try {
- ldapConfig.setDeleted("false");
+ ldapConfig.setDeleted(false);
ldapConfig.setInserted(new Date());
ldapConfig = em.merge(ldapConfig);
@@ -115,7 +115,7 @@ public class LdapConfigDaoImpl {
ldapConfig.setAddDomainToUserName(addDomainToUserName);
ldapConfig.setConfigFileName(configFileName);
- ldapConfig.setDeleted("false");
+ ldapConfig.setDeleted(false);
ldapConfig.setDomain(domain);
ldapConfig.setIsActive(isActive);
ldapConfig.setName(name);
@@ -143,11 +143,11 @@ public class LdapConfigDaoImpl {
String hql = "select c from LdapConfig c " +
"WHERE c.ldapConfigId = :ldapConfigId " +
- "AND c.deleted LIKE :deleted";
+ "AND c.deleted = :deleted";
TypedQuery<LdapConfig> query = em.createQuery(hql, LdapConfig.class);
query.setParameter("ldapConfigId", ldapConfigId);
- query.setParameter("deleted", "false");
+ query.setParameter("deleted", false);
LdapConfig ldapConfig = null;
try {
@@ -168,7 +168,7 @@ public class LdapConfigDaoImpl {
CriteriaBuilder cb = em.getCriteriaBuilder();
CriteriaQuery<LdapConfig> cq = cb.createQuery(LdapConfig.class);
Root<LdapConfig> c = cq.from(LdapConfig.class);
- Predicate condition = cb.equal(c.get("deleted"), "false");
+ Predicate condition = cb.equal(c.get("deleted"), false);
cq.where(condition);
cq.distinct(asc);
if (asc){
@@ -191,7 +191,7 @@ public class LdapConfigDaoImpl {
try {
log.debug("selectMaxFromConfigurations ");
//get all users
- TypedQuery<Long> query = em.createQuery("select count(c.ldapConfigId) from LdapConfig c where c.deleted LIKE 'false'", Long.class);
+ TypedQuery<Long> query = em.createQuery("select count(c.ldapConfigId) from LdapConfig c where c.deleted = false", Long.class);
List<Long> ll = query.getResultList();
log.debug("selectMaxFromLdapConfig" + ll.get(0));
return ll.get(0);
@@ -226,7 +226,7 @@ public class LdapConfigDaoImpl {
log.debug("selectMaxFromConfigurations ");
String hql = "select c from LdapConfig c " +
- "where c.deleted LIKE 'false' " +
+ "where c.deleted = false " +
"AND c.isActive = :isActive ";
//get all users
@@ -246,7 +246,7 @@ public class LdapConfigDaoImpl {
log.debug("selectMaxFromConfigurations ");
String hql = "select c from LdapConfig c " +
- "where c.deleted LIKE 'false' ";
+ "where c.deleted = false ";
//get all users
TypedQuery<LdapConfig> query = em.createQuery(hql, LdapConfig.class);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentCategoryDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentCategoryDaoImpl.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentCategoryDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentCategoryDaoImpl.java Sun Jul 22 15:52:23 2012
@@ -56,7 +56,7 @@ public class AppointmentCategoryDaoImpl
+ "AND app.categoryId = :categoryId";
TypedQuery<AppointmentCategory> query = em.createQuery(hql, AppointmentCategory.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
query.setParameter("categoryId", categoryId);
AppointmentCategory appointCategory = null;
@@ -103,7 +103,7 @@ public class AppointmentCategoryDaoImpl
ac.setName(name);
ac.setStarttime(new Date());
- ac.setDeleted("false");
+ ac.setDeleted(false);
ac.setUser(usersDao.getUser(user_id));
ac.setComment(comment);
@@ -130,7 +130,7 @@ public class AppointmentCategoryDaoImpl
return categoryId;
}
ac.setUpdatetime(new Date());
- ac.setDeleted("true");
+ ac.setDeleted(true);
if (ac.getCategoryId() == null) {
em.persist(ac);
} else {
@@ -152,7 +152,7 @@ public class AppointmentCategoryDaoImpl
+ "WHERE a.deleted <> :deleted ";
TypedQuery<AppointmentCategory> query = em.createQuery(hql, AppointmentCategory.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
List<AppointmentCategory> listAppointmentCategory = query
.getResultList();
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java Sun Jul 22 15:52:23 2012
@@ -97,7 +97,7 @@ public class AppointmentDaoImpl {
+ "AND a.room.rooms_id = :room_id ";
TypedQuery<Appointment> query = em.createQuery(hql, Appointment.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
query.setParameter("room_id", room_id);
List<Appointment> appoint = query.getResultList();
@@ -119,7 +119,7 @@ public class AppointmentDaoImpl {
+ "AND a.appointmentId = :appointmentId ";
TypedQuery<Appointment> query = em.createQuery(hql, Appointment.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
query.setParameter("appointmentId", appointmentId);
Appointment appoint = null;
@@ -164,7 +164,7 @@ public class AppointmentDaoImpl {
TypedQuery<Appointment> query = em.createQuery(hql,
Appointment.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
List<Appointment> appointList = query.getResultList();
@@ -230,7 +230,7 @@ public class AppointmentDaoImpl {
.getAppointmentReminderTypById(remind));
ap.setStarttime(new Date());
ap.setIsReminderEmailSend(false);
- ap.setDeleted("false");
+ ap.setDeleted(false);
ap.setIsDaily(isDaily);
ap.setIsWeekly(isWeekly);
ap.setIsMonthly(isMonthly);
@@ -692,7 +692,7 @@ public class AppointmentDaoImpl {
Appointment app = this.getAppointmentById(appointmentId);
app.setUpdatetime(new Date());
- app.setDeleted("true");
+ app.setDeleted(true);
if (app.getAppointmentId() == null) {
em.persist(app);
@@ -724,7 +724,7 @@ public class AppointmentDaoImpl {
log.debug("Start " + calstart.getTime() + " End " + calend.getTime());
TypedQuery<Appointment> query = em.createNamedQuery("appointmentsInRange", Appointment.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
query.setParameter("starttime", calstart.getTime());
query.setParameter("endtime", calend.getTime());
query.setParameter("userId", userId);
@@ -764,7 +764,7 @@ public class AppointmentDaoImpl {
TypedQuery<Appointment> query = em.createQuery(hql,
Appointment.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
query.setParameter("categoryId", categoryId);
List<Appointment> listAppoints = query.getResultList();
@@ -781,7 +781,7 @@ public class AppointmentDaoImpl {
CriteriaBuilder cb = em.getCriteriaBuilder();
CriteriaQuery<Appointment> cq = cb.createQuery(Appointment.class);
Root<Appointment> c = cq.from(Appointment.class);
- Predicate condition = cb.equal(c.get("deleted"), "false");
+ Predicate condition = cb.equal(c.get("deleted"), false);
Predicate subCondition = cb.equal(c.get("categoryId"), cat_id);
cq.where(condition, subCondition);
TypedQuery<Appointment> q = em.createQuery(cq);
@@ -803,7 +803,7 @@ public class AppointmentDaoImpl {
+ "AND a.appointmentStarttime > :appointmentStarttime ";
TypedQuery<Appointment> query = em.createQuery(hql, Appointment.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
query.setParameter("appointmentStarttime", appointmentStarttime);
Appointment appoint = null;
@@ -828,7 +828,7 @@ public class AppointmentDaoImpl {
TypedQuery<Appointment> query = em.createQuery(hql,
Appointment.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
query.setParameter("appointmentName", name);
List<Appointment> listAppoints = query.getResultList();
@@ -876,7 +876,7 @@ public class AppointmentDaoImpl {
Appointment.class);
query.setParameter("mm_deleted", true);
- query.setParameter("app_deleted", "true");
+ query.setParameter("app_deleted", true);
query.setParameter("userId", userId);
query.setParameter("starttime", startCal.getTime());
@@ -935,7 +935,7 @@ public class AppointmentDaoImpl {
log.debug("stopStamp "+stopStamp);
query.setParameter("mm_deleted", true);
- query.setParameter("app_deleted", "true");
+ query.setParameter("app_deleted", true);
query.setParameter("starttime", startStamp);
query.setParameter("endtime", stopStamp);
if (isReminderEmailSend != null) {
@@ -964,7 +964,7 @@ public class AppointmentDaoImpl {
TypedQuery<Appointment> query = em.createQuery(hql,
Appointment.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
query.setParameter("user_id", user_id);
query.setParameter("rooms_id", rooms_id);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentReminderTypDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentReminderTypDaoImpl.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentReminderTypDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentReminderTypDaoImpl.java Sun Jul 22 15:52:23 2012
@@ -55,7 +55,7 @@ public class AppointmentReminderTypDaoIm
+ "AND app.typId = :typId";
TypedQuery<AppointmentReminderTyps> query = em.createQuery(hql, AppointmentReminderTyps.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
query.setParameter("typId", typId);
AppointmentReminderTyps appointmentReminderTyps = null;
@@ -102,7 +102,7 @@ public class AppointmentReminderTypDaoIm
ac.setName(name);
ac.setStarttime(new Date());
- ac.setDeleted("false");
+ ac.setDeleted(false);
ac.setUser(usersDao.getUser(user_id));
ac = em.merge(ac);
@@ -128,7 +128,7 @@ public class AppointmentReminderTypDaoIm
return typId;
}
ac.setUpdatetime(new Date());
- ac.setDeleted("true");
+ ac.setDeleted(true);
if (ac.getTypId() == null) {
em.persist(ac);
@@ -154,7 +154,7 @@ public class AppointmentReminderTypDaoIm
+ "WHERE a.deleted <> :deleted ";
TypedQuery<AppointmentReminderTyps> query = em.createQuery(hql, AppointmentReminderTyps.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
List<AppointmentReminderTyps> listAppointmentReminderTyp = query
.getResultList();
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/MeetingMemberDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/MeetingMemberDaoImpl.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/MeetingMemberDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/MeetingMemberDaoImpl.java Sun Jul 22 15:52:23 2012
@@ -109,36 +109,6 @@ public class MeetingMemberDaoImpl {
return null;
}
- /*
- * public List<MeetingMember> getMeetingMemberByRange(Long userId, Date
- * starttime, Date endtime) { try {
- *
- *
- *
- * String hql = "select a from Appointment a , MeetingMember mm " +
- * "WHERE a.deleted != :deleted " + "AND mm.userid = :userid " + "AND "+
- * "( " + "(a.appointmentStarttime BETWEEN :starttime AND :endtime) "+ "OR "
- * + "(a.appointmentEndtime BETWEEN :starttime AND :endtime) "+ "OR " +
- * "(a.appointmentStarttime < :starttime AND a.appointmentEndtime > :endtime) "
- * + ") "+ "AND " + "( " + "a.userId = :userid "+ ")";
- *
- * //"AND (a.terminstatus != 4 AND a.terminstatus != 5)";
- *
- * Object idf = HibernateUtil.createSession(); EntityManager session =
- * HibernateUtil.getSession(); EntityTransaction tx =
- * session.getTransaction(); tx.begin(); Query query =
- * session.createQuery(hql); query.setParameter("deleted", "true");
- * query.setParameter("starttime", starttime); query.setParameter("endtime",
- * endtime); query.setParameter("userid",userId);
- *
- * List<MeetingMember> listAppoints = query.getResultList(); tx.commit();
- * HibernateUtil.closeSession(idf);
- *
- * return listAppoints; } catch (HibernateException ex) {
- * log.error("[getMeetingMemberByRange]: " + ex); } catch (Exception ex2) {
- * log.error("[getMeetingMemberByRange]: " + ex2); } return null; }
- */
-
/**
* Updating MeetingMember
*/
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Invitationmanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Invitationmanagement.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Invitationmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Invitationmanagement.java Sun Jul 22 15:52:23 2012
@@ -166,7 +166,7 @@ public class Invitationmanagement {
invitation.setInvitationWasUsed(false);
}
- invitation.setDeleted("false");
+ invitation.setDeleted(false);
Users us = usersDao.getUser(createdBy);
String hashRaw = "HASH" + (System.currentTimeMillis());
@@ -274,7 +274,7 @@ public class Invitationmanagement {
Invitations inv = member.getInvitation();
if (inv != null) {
- inv.setDeleted("true");
+ inv.setDeleted(true);
updateInvitation(inv);
}
@@ -552,7 +552,7 @@ public class Invitationmanagement {
invitation.setInvitationWasUsed(false);
}
- invitation.setDeleted("false");
+ invitation.setDeleted(false);
Users us = usersDao.getUser(createdBy);
String hashRaw = "InvitationHash"
@@ -965,7 +965,7 @@ public class Invitationmanagement {
+ "AND invi.invitations_id = :invid";
TypedQuery<Invitations> query = em.createQuery(hql, Invitations.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
query.setParameter("invid", invId);
Invitations inv = null;
@@ -990,7 +990,7 @@ public class Invitationmanagement {
+ "AND invi.invitations_id = :invid";
TypedQuery<Invitations> query = em.createQuery(hql, Invitations.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
query.setParameter("invid", invId);
Invitations inv = null;
@@ -1019,7 +1019,7 @@ public class Invitationmanagement {
+ "AND c.deleted = :deleted";
TypedQuery<Invitations> query = em.createQuery(hql, Invitations.class);
query.setParameter("hashCode", hashCode);
- query.setParameter("deleted", "false");
+ query.setParameter("deleted", false);
Invitations invitation = null;
try {
invitation = query.getSingleResult();
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java Sun Jul 22 15:52:23 2012
@@ -98,7 +98,7 @@ public class Roommanagement {
RoomTypes rtype = new RoomTypes();
rtype.setName(name);
rtype.setStarttime(new Date());
- rtype.setDeleted(deleted ? "true" : "false");
+ rtype.setDeleted(deleted);
rtype = em.merge(rtype);
long returnId = rtype.getRoomtypes_id();
return returnId;
@@ -144,7 +144,7 @@ public class Roommanagement {
if (authLevelManagement.checkUserLevel(user_level)) {
TypedQuery<RoomTypes> query = em
.createQuery("select c from RoomTypes as c where c.deleted <> :deleted", RoomTypes.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
List<RoomTypes> ll = query.getResultList();
return ll;
}
@@ -165,7 +165,7 @@ public class Roommanagement {
TypedQuery<RoomTypes> query = em
.createQuery("select c from RoomTypes as c where c.roomtypes_id = :roomtypes_id AND c.deleted <> :deleted", RoomTypes.class);
query.setParameter("roomtypes_id", roomtypes_id);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
List<?> ll = query.getResultList();
if (ll.size() > 0) {
return (RoomTypes) ll.get(0);
@@ -232,7 +232,7 @@ public class Roommanagement {
TypedQuery<Rooms> query = em.createQuery(hql, Rooms.class);
query.setParameter("rooms_id", rooms_id);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
List<Rooms> ll = query.getResultList();
if (ll.size() > 0) {
room = ll.get(0);
@@ -267,7 +267,7 @@ public class Roommanagement {
query.setParameter("externalRoomId", externalRoomId);
query.setParameter("externalRoomType", externalRoomType);
query.setParameter("roomtypes_id", roomtypes_id);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
List<?> ll = query.getResultList();
if (ll.size() > 0) {
return (Rooms) ll.get(0);
@@ -382,7 +382,7 @@ public class Roommanagement {
public Long selectMaxFromRooms(String search) {
try {
String hql = "select count(c.rooms_id) from Rooms c "
- + "where c.deleted <> 'true' " + "AND c.name LIKE :search ";
+ + "where c.deleted <> true AND c.name LIKE :search ";
if (search.length() == 0) {
search = "%";
@@ -418,7 +418,7 @@ public class Roommanagement {
CriteriaBuilder cb = em.getCriteriaBuilder();
CriteriaQuery<Rooms> cq = cb.createQuery(Rooms.class);
Root<Rooms> c = cq.from(Rooms.class);
- Predicate condition = cb.equal(c.get("deleted"), "false");
+ Predicate condition = cb.equal(c.get("deleted"), false);
cq.where(condition);
cq.distinct(asc);
if (asc) {
@@ -452,7 +452,7 @@ public class Roommanagement {
try {
String hql = "select c from Rooms c "
- + "where c.deleted <> 'true' " + "AND c.name LIKE :search ";
+ + "where c.deleted <> true AND c.name LIKE :search ";
if (search.length() == 0) {
search = "%";
@@ -486,7 +486,7 @@ public class Roommanagement {
CriteriaBuilder cb = em.getCriteriaBuilder();
CriteriaQuery<Rooms> cq = cb.createQuery(Rooms.class);
Root<Rooms> c = cq.from(Rooms.class);
- Predicate condition = cb.equal(c.get("deleted"), "false");
+ Predicate condition = cb.equal(c.get("deleted"), false);
cq.where(condition);
TypedQuery<Rooms> q = em.createQuery(cq);
List<Rooms> ll = q.getResultList();
@@ -517,7 +517,7 @@ public class Roommanagement {
CriteriaBuilder cb = em.getCriteriaBuilder();
CriteriaQuery<Rooms> cq = cb.createQuery(Rooms.class);
Root<Rooms> c = cq.from(Rooms.class);
- Predicate condition = cb.equal(c.get("deleted"), "false");
+ Predicate condition = cb.equal(c.get("deleted"), false);
Predicate subCondition = cb.equal(c.get("externalRoomType"),
externalRoomType);
cq.where(condition, subCondition);
@@ -548,7 +548,7 @@ public class Roommanagement {
TypedQuery<Rooms_Organisation> q = em.createQuery(hql, Rooms_Organisation.class);
q.setParameter("rooms_id", rooms_id);
- q.setParameter("deleted", "true");
+ q.setParameter("deleted", true);
List<Rooms_Organisation> ll = q.getResultList();
return ll;
}
@@ -575,7 +575,7 @@ public class Roommanagement {
TypedQuery<Rooms> q = em.createQuery(queryString, Rooms.class);
//
q.setParameter("ispublic", true);
- q.setParameter("deleted", "false");
+ q.setParameter("deleted", false);
q.setParameter("roomtypes_id", new Long(roomtypes_id));
List<Rooms> ll = q.getResultList();
@@ -632,7 +632,7 @@ public class Roommanagement {
TypedQuery<Rooms> q = em.createQuery(queryString, Rooms.class);
q.setParameter("ispublic", true);
- q.setParameter("deleted", "true");
+ q.setParameter("deleted", true);
List<Rooms> ll = q.getResultList();
return ll;
@@ -660,7 +660,7 @@ public class Roommanagement {
TypedQuery<Rooms> q = em.createQuery(queryString, Rooms.class);
//
q.setParameter("appointed", true);
- q.setParameter("deleted", "false");
+ q.setParameter("deleted", false);
List<Rooms> ll = q.getResultList();
@@ -692,7 +692,7 @@ public class Roommanagement {
TypedQuery<Rooms> q = em.createQuery(queryString, Rooms.class);
//
q.setParameter("ispublic", true);
- q.setParameter("deleted", "false");
+ q.setParameter("deleted", false);
List<Rooms> ll = q.getResultList();
return ll;
@@ -767,7 +767,7 @@ public class Roommanagement {
r.setIsModeratedRoom(isModeratedRoom);
r.setHideTopBar(hideTopBar);
- r.setDeleted("false");
+ r.setDeleted(false);
r.setIsClosed(isClosed);
r.setRedirectURL(redirectURL);
@@ -858,7 +858,7 @@ public class Roommanagement {
r.setIsModeratedRoom(isModeratedRoom);
- r.setDeleted("false");
+ r.setDeleted(false);
r = em.merge(r);
long returnId = r.getRooms_id();
@@ -915,7 +915,7 @@ public class Roommanagement {
r.setIsModeratedRoom(isModeratedRoom);
- r.setDeleted("false");
+ r.setDeleted(false);
r.setExternalRoomId(externalRoomId);
r.setExternalRoomType(externalRoomType);
@@ -968,7 +968,7 @@ public class Roommanagement {
rOrganisation.setStarttime(new Date());
rOrganisation.setOrganisation(organisationmanagement
.getOrganisationById(organisation_id));
- rOrganisation.setDeleted("false");
+ rOrganisation.setDeleted(false);
rOrganisation = em.merge(rOrganisation);
long returnId = rOrganisation.getRooms_organisation_id();
@@ -1042,7 +1042,7 @@ public class Roommanagement {
q.setParameter("roomtypes_id", roomtypes_id);
q.setParameter("organisation_id", organisation_id);
- q.setParameter("deleted", "true");
+ q.setParameter("deleted", true);
List<Rooms_Organisation> ll = q.getResultList();
return ll;
@@ -1075,7 +1075,7 @@ public class Roommanagement {
TypedQuery<Rooms_Organisation> query = em.createQuery(hql, Rooms_Organisation.class);
query.setParameter("organisation_id", organisation_id);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
List<Rooms_Organisation> ll = query.getResultList();
@@ -1119,7 +1119,7 @@ public class Roommanagement {
TypedQuery<Rooms_Organisation> q = em.createQuery(hql, Rooms_Organisation.class);
q.setParameter("organisation_id", organisation_id);
- q.setParameter("deleted", "true");
+ q.setParameter("deleted", true);
List<Rooms_Organisation> ll = q.getResultList();
return ll.size();
@@ -1159,7 +1159,7 @@ public class Roommanagement {
TypedQuery<Rooms_Organisation> q = em.createQuery(hql, Rooms_Organisation.class);
q.setParameter("organisation_id", organisation_id);
- q.setParameter("deleted", "true");
+ q.setParameter("deleted", true);
q.setFirstResult(start);
q.setMaxResults(max);
List<Rooms_Organisation> ll = q.getResultList();
@@ -1182,7 +1182,7 @@ public class Roommanagement {
q.setParameter("rooms_id", rooms_id);
q.setParameter("organisation_id", organisation_id);
- q.setParameter("deleted", "true");
+ q.setParameter("deleted", true);
List<Rooms_Organisation> ll = q.getResultList();
if (ll.size() > 0) {
@@ -1207,7 +1207,7 @@ public class Roommanagement {
TypedQuery<Rooms_Organisation> q = em.createQuery(hql, Rooms_Organisation.class);
q.setParameter("rooms_id", rooms_id);
- q.setParameter("deleted", "true");
+ q.setParameter("deleted", true);
List<Rooms_Organisation> ll = q.getResultList();
return ll;
} catch (Exception ex2) {
@@ -1565,7 +1565,7 @@ public class Roommanagement {
public Long deleteRoom(Rooms r) {
log.debug("deleteRoom");
try {
- r.setDeleted("true");
+ r.setDeleted(true);
r.setUpdatetime(new Date());
if (r.getRooms_id() == null) {
em.persist(r);
@@ -1654,7 +1654,7 @@ public class Roommanagement {
*/
public Long deleteRoomsOrganisation(Rooms_Organisation rOrg) {
try {
- rOrg.setDeleted("true");
+ rOrg.setDeleted(true);
rOrg.setUpdatetime(new Date());
if (rOrg.getRooms_organisation_id() == null) {
em.persist(rOrg);
@@ -1732,7 +1732,7 @@ public class Roommanagement {
TypedQuery<Rooms> query = em.createQuery(hql, Rooms.class);
query.setParameter("ownerId", ownerId);
query.setParameter("roomtypesId", roomtypesId);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
List<Rooms> ll = query.getResultList();
if (ll.size() > 0) {
room = ll.get(0);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/dao/RoomModeratorsDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/dao/RoomModeratorsDaoImpl.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/dao/RoomModeratorsDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/dao/RoomModeratorsDaoImpl.java Sun Jul 22 15:52:23 2012
@@ -60,7 +60,7 @@ public class RoomModeratorsDaoImpl {
rModerator.setUser(us);
rModerator.setIsSuperModerator(isSuperModerator);
rModerator.setStarttime(new Date());
- rModerator.setDeleted("false");
+ rModerator.setDeleted(false);
rModerator.setRoomId(roomId);
rModerator = em.merge(rModerator);
long rModeratorId = rModerator.getRoomModeratorsId();
@@ -118,7 +118,7 @@ public class RoomModeratorsDaoImpl {
TypedQuery<RoomModerators> query = em.createQuery(hql, RoomModerators.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
query.setParameter("roomId", roomId);
List<RoomModerators> roomModerators = query.getResultList();
@@ -143,7 +143,7 @@ public class RoomModeratorsDaoImpl {
TypedQuery<RoomModerators> query = em.createQuery(hql, RoomModerators.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
query.setParameter("roomId", roomId);
query.setParameter("user_id", user_id);
@@ -172,7 +172,7 @@ public class RoomModeratorsDaoImpl {
}
rModerator.setUpdatetime(new Date());
- rModerator.setDeleted("true");
+ rModerator.setDeleted(true);
if (rModerator.getRoomModeratorsId() == 0) {
em.persist(rModerator);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/file/dao/FileExplorerItemDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/file/dao/FileExplorerItemDaoImpl.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/file/dao/FileExplorerItemDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/file/dao/FileExplorerItemDaoImpl.java Sun Jul 22 15:52:23 2012
@@ -56,7 +56,7 @@ public class FileExplorerItemDaoImpl {
FileExplorerItem fileItem = new FileExplorerItem();
fileItem.setFileName(fileName);
fileItem.setFileHash(fileHash);
- fileItem.setDeleted("false");
+ fileItem.setDeleted(false);
fileItem.setParentFileExplorerItemId(parentFileExplorerItemId);
fileItem.setOwnerId(ownerId);
fileItem.setRoom_id(room_id);
@@ -106,7 +106,7 @@ public class FileExplorerItemDaoImpl {
+ "ORDER BY c.isFolder DESC, c.fileName ";
TypedQuery<FileExplorerItem> query = em.createQuery(hql, FileExplorerItem.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
query.setParameter("room_id",room_id);
query.setParameter("ownerId",ownerId);
@@ -132,7 +132,7 @@ public class FileExplorerItemDaoImpl {
"ORDER BY c.isFolder DESC, c.fileName ";
TypedQuery<FileExplorerItem> query = em.createQuery(hql, FileExplorerItem.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
query.setParameter("room_id",room_id);
query.setParameter("parentFileExplorerItemId", parentFileExplorerItemId);
@@ -157,7 +157,7 @@ public class FileExplorerItemDaoImpl {
+ "ORDER BY c.isFolder DESC, c.fileName ";
TypedQuery<FileExplorerItem> query = em.createQuery(hql, FileExplorerItem.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
query.setParameter("ownerId",ownerId);
query.setParameter("parentFileExplorerItemId", parentFileExplorerItemId);
@@ -181,7 +181,7 @@ public class FileExplorerItemDaoImpl {
+ "ORDER BY c.isFolder DESC, c.fileName ";
TypedQuery<FileExplorerItem> query = em.createQuery(hql, FileExplorerItem.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
query.setParameter("parentFileExplorerItemId", parentFileExplorerItemId);
FileExplorerItem[] fileExplorerList = query.getResultList().toArray(new FileExplorerItem[0]);
@@ -283,7 +283,7 @@ public class FileExplorerItemDaoImpl {
FileExplorerItem fId = this
.getFileExplorerItemsById(fileExplorerItemId);
- fId.setDeleted("true");
+ fId.setDeleted(true);
fId.setUpdated(new Date());
if (fId.getFileExplorerItemId() == 0) {
@@ -310,7 +310,7 @@ public class FileExplorerItemDaoImpl {
throw new Exception("externalFilesid: "+externalFilesid+" and externalType: "+externalType+" Not found");
}
- fId.setDeleted("true");
+ fId.setDeleted(true);
fId.setUpdated(new Date());
if (fId.getFileExplorerItemId() == 0) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java Sun Jul 22 15:52:23 2012
@@ -87,7 +87,7 @@ public class FlvRecordingDaoImpl {
"WHERE c.deleted <> :deleted ";
TypedQuery<FlvRecording> query = em.createQuery(hql, FlvRecording.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
List<FlvRecording> flvRecordings = query.getResultList();
@@ -112,7 +112,7 @@ public class FlvRecordingDaoImpl {
TypedQuery<FlvRecording> query = em.createQuery(hql, FlvRecording.class);
query.setParameter("externalUserId", externalUserId);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
List<FlvRecording> flvRecordingList = query.getResultList();
@@ -139,7 +139,7 @@ public class FlvRecordingDaoImpl {
TypedQuery<FlvRecording> query = em.createQuery(hql, FlvRecording.class);
query.setParameter("externalRoomType", externalRoomType);
query.setParameter("insertedBy", insertedBy);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
List<FlvRecording> flvRecordingList = query.getResultList();
@@ -180,7 +180,7 @@ public class FlvRecordingDaoImpl {
TypedQuery<FlvRecording> query = em.createQuery(hql, FlvRecording.class);
query.setParameter("externalRoomType", externalRoomType);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
List<FlvRecording> flvRecordingList = query.getResultList();
@@ -203,7 +203,7 @@ public class FlvRecordingDaoImpl {
"ORDER BY c.isFolder DESC, c.fileName ";
TypedQuery<FlvRecording> query = em.createQuery(hql, FlvRecording.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
List<FlvRecording> flvRecordingList = query.getResultList();
return flvRecordingList;
@@ -225,7 +225,7 @@ public class FlvRecordingDaoImpl {
TypedQuery<FlvRecording> query = em.createQuery(hql, FlvRecording.class);
query.setParameter("organization_id", organization_id);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
List<FlvRecording> flvRecordingList = query.getResultList();
@@ -246,7 +246,7 @@ public class FlvRecordingDaoImpl {
"ORDER BY c.isFolder DESC, c.fileName ";
TypedQuery<FlvRecording> query = em.createQuery(hql, FlvRecording.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
query.setParameter("ownerId",ownerId);
List<FlvRecording> flvRecordingList = query.getResultList();
@@ -268,7 +268,7 @@ public class FlvRecordingDaoImpl {
"ORDER BY c.isFolder DESC, c.fileName ";
TypedQuery<FlvRecording> query = em.createQuery(hql, FlvRecording.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
query.setParameter("ownerId",ownerId);
query.setParameter("parentFileExplorerItemId", parentFileExplorerItemId);
@@ -290,7 +290,7 @@ public class FlvRecordingDaoImpl {
"ORDER BY c.isFolder DESC, c.fileName ";
TypedQuery<FlvRecording> query = em.createQuery(hql, FlvRecording.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
query.setParameter("room_id",room_id);
List<FlvRecording> flvRecordingList = query.getResultList();
@@ -311,7 +311,7 @@ public class FlvRecordingDaoImpl {
"ORDER BY c.isFolder DESC, c.fileName ";
TypedQuery<FlvRecording> query = em.createQuery(hql, FlvRecording.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
query.setParameter("parentFileExplorerItemId", parentFileExplorerItemId);
List<FlvRecording> flvRecordingList = query.getResultList();
@@ -332,7 +332,7 @@ public class FlvRecordingDaoImpl {
flvRecording.setParentFileExplorerItemId(parentFileExplorerItemId);
- flvRecording.setDeleted("false");
+ flvRecording.setDeleted(false);
flvRecording.setFileHash(fileHash);
flvRecording.setFileName(fileName);
flvRecording.setFileSize(fileSize);
@@ -368,7 +368,7 @@ public class FlvRecordingDaoImpl {
FlvRecording flvRecording = new FlvRecording();
- flvRecording.setDeleted("false");
+ flvRecording.setDeleted(false);
flvRecording.setFileHash(fileHash);
flvRecording.setFileName(fileName);
flvRecording.setFileSize(fileSize);
@@ -487,7 +487,7 @@ public class FlvRecordingDaoImpl {
return false;
}
- fId.setDeleted("true");
+ fId.setDeleted(true);
fId.setUpdated(new Date());
if (fId.getFlvRecordingId() == 0) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/FlvRecordingMetaDataDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/FlvRecordingMetaDataDaoImpl.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/FlvRecordingMetaDataDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/FlvRecordingMetaDataDaoImpl.java Sun Jul 22 15:52:23 2012
@@ -75,7 +75,7 @@ public class FlvRecordingMetaDataDaoImpl
TypedQuery<FlvRecordingMetaData> query = em.createQuery(hql, FlvRecordingMetaData.class);
query.setParameter("flvRecordingId", flvRecordingId);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
List<FlvRecordingMetaData> flvRecordingMetaDatas = query.getResultList();
@@ -140,7 +140,7 @@ public class FlvRecordingMetaDataDaoImpl
FlvRecordingMetaData flvRecordingMetaData = new FlvRecordingMetaData();
- flvRecordingMetaData.setDeleted("false");
+ flvRecordingMetaData.setDeleted(false);
flvRecordingMetaData.setFlvRecording(flvRecordingDao.getFlvRecordingById(flvRecordingId));
flvRecordingMetaData.setFreeTextUserName(freeTextUserName);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Emailmanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Emailmanagement.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Emailmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Emailmanagement.java Sun Jul 22 15:52:23 2012
@@ -119,7 +119,7 @@ public class Emailmanagement {
TypedQuery<Adresses> query = em
.createQuery("select c from Adresses as c where c.email LIKE :email AND c.deleted <> :deleted", Adresses.class);
query.setParameter("email", email);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
int count = query.getResultList().size();
log.debug("size: " + count);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Organisationmanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Organisationmanagement.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Organisationmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Organisationmanagement.java Sun Jul 22 15:52:23 2012
@@ -97,7 +97,7 @@ public class Organisationmanagement {
Organisation org = new Organisation();
org.setName(orgname);
org.setInsertedby(new Long(user_id));
- org.setDeleted("false");
+ org.setDeleted(false);
org.setStarttime(new Date());
org = em.merge(org);
@@ -159,7 +159,7 @@ public class Organisationmanagement {
CriteriaBuilder cb = em.getCriteriaBuilder();
CriteriaQuery<Organisation> cq = cb.createQuery(Organisation.class);
Root<Organisation> c = cq.from(Organisation.class);
- Predicate condition = cb.equal(c.get("deleted"), "false");
+ Predicate condition = cb.equal(c.get("deleted"), false);
cq.where(condition);
cq.distinct(asc);
if (asc) {
@@ -185,7 +185,7 @@ public class Organisationmanagement {
CriteriaQuery<Organisation> cq = cb
.createQuery(Organisation.class);
Root<Organisation> c = cq.from(Organisation.class);
- Predicate condition = cb.equal(c.get("deleted"), "false");
+ Predicate condition = cb.equal(c.get("deleted"), false);
cq.where(condition);
TypedQuery<Organisation> q = em.createQuery(cq);
List<Organisation> ll = q.getResultList();
@@ -207,7 +207,7 @@ public class Organisationmanagement {
try {
// get all users
TypedQuery<Long> query = em
- .createQuery("select max(c.organisation_id) from Organisation c where c.deleted LIKE 'false'", Long.class);
+ .createQuery("select max(c.organisation_id) from Organisation c where c.deleted LIKE false", Long.class);
Long l = query.getSingleResult();
log.debug("selectMaxFromOrganisations" + l);
return l;
@@ -373,7 +373,7 @@ public class Organisationmanagement {
try {
TypedQuery<Organisation> query = em.createNamedQuery("getOrganisationById", Organisation.class);
query.setParameter("organisation_id", organisation_id);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
Organisation o = null;
try {
o = query.getSingleResult();
@@ -433,7 +433,7 @@ public class Organisationmanagement {
.executeUpdate();
Organisation org = this.getOrganisationById(organisation_id);
- org.setDeleted("true");
+ org.setDeleted(true);
org.setUpdatedby(updatedby);
if (org.getOrganisation_id() == null) {
@@ -479,7 +479,7 @@ public class Organisationmanagement {
Organisation_Users orgUser = new Organisation_Users();
orgUser.setOrganisation(getOrganisationById(organisation_id));
- orgUser.setDeleted("false");
+ orgUser.setDeleted(false);
return orgUser;
}
@@ -604,7 +604,7 @@ public class Organisationmanagement {
"SELECT c FROM "
+ "Users c "
+ ", IN(c.organisation_users) ou "
- + "WHERE c.deleted = 'false' AND ou.organisation.organisation_id = :organisation_id ";
+ + "WHERE c.deleted = false AND ou.organisation.organisation_id = :organisation_id ";
if (orderby.startsWith("c.")) {
hql += "ORDER BY " + orderby;
} else {
@@ -706,7 +706,7 @@ public class Organisationmanagement {
"SELECT o FROM Organisation AS o "
+ "WHERE o.organisation_id NOT IN ("
+ " SELECT ou.organisation.organisation_id "
- + " FROM Users u, IN(u.organisation_users) ou WHERE u.deleted = 'false' AND u.user_id = :user_id)";
+ + " FROM Users u, IN(u.organisation_users) ou WHERE u.deleted = false AND u.user_id = :user_id)";
TypedQuery<Organisation> q = em.createQuery(qSQL, Organisation.class);
q.setParameter("user_id", user_id);
q.setFirstResult(start);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Salutationmanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Salutationmanagement.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Salutationmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Salutationmanagement.java Sun Jul 22 15:52:23 2012
@@ -62,7 +62,7 @@ public class Salutationmanagement {
try {
Salutations ti = new Salutations();
ti.setName(titelname);
- ti.setDeleted("false");
+ ti.setDeleted(false);
ti.setFieldvalues_id(fieldvalues_id);
ti.setStarttime(new Date());
ti = em.merge(ti);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Statemanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Statemanagement.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Statemanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Statemanagement.java Sun Jul 22 15:52:23 2012
@@ -70,7 +70,7 @@ public class Statemanagement {
st.setShortName(shortName);
st.setCode(code);
st.setStarttime(new Date());
- st.setDeleted("false");
+ st.setDeleted(false);
st = em.merge(st);
Long id = st.getState_id();
@@ -95,7 +95,7 @@ public class Statemanagement {
TypedQuery<States> query = em
.createQuery("select c from States as c where c.state_id = :state_id AND c.deleted <> :deleted", States.class);
query.setParameter("state_id", state_id);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
List<States> ll = query.getResultList();
if (ll.size() > 0) {
return ll.get(0);
@@ -115,7 +115,7 @@ public class Statemanagement {
try {
TypedQuery<States> query = em
.createQuery("select c from States as c where c.deleted <> :deleted", States.class);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
List<States> ll = query.getResultList();
return ll;
} catch (Exception ex2) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java Sun Jul 22 15:52:23 2012
@@ -142,7 +142,7 @@ public class Usermanagement {
CriteriaBuilder cb = em.getCriteriaBuilder();
CriteriaQuery<Users> cq = cb.createQuery(Users.class);
Root<Users> c = cq.from(Users.class);
- Predicate condition = cb.equal(c.get("deleted"), "false");
+ Predicate condition = cb.equal(c.get("deleted"), false);
cq.where(condition);
cq.distinct(asc);
if (asc) {
@@ -176,7 +176,7 @@ public class Usermanagement {
// log.debug("getUserContactsBySearch: "+ userId);
String hql = "select u from Users u "
- + "WHERE u.deleted = 'false' ";
+ + "WHERE u.deleted = false ";
hql += "AND ( ";
for (int i = 0; i < searchItems.length; i++) {
@@ -268,7 +268,7 @@ public class Usermanagement {
TypedQuery<Users> query = em.createQuery(hql, Users.class);
query.setParameter("userOrEmail", userOrEmail);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
List<Users> ll = query.getResultList();
@@ -404,7 +404,7 @@ public class Usermanagement {
// searchstring + "%"));
Path<String> path = c.get(searchcriteria);
Predicate predicate = cb.like(path, literal);
- Predicate condition = cb.notEqual(c.get("deleted"), "true");
+ Predicate condition = cb.notEqual(c.get("deleted"), true);
cq.where(condition, predicate);
cq.distinct(asc);
if (asc) {
@@ -430,7 +430,7 @@ public class Usermanagement {
TypedQuery<Userdata> query = em
.createQuery("select c from Userdata as c where c.user_id = :user_id AND c.deleted <> :deleted", Userdata.class);
query.setParameter("user_id", user_id.longValue());
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
List<Userdata> ll = query.getResultList();
return ll;
} catch (Exception ex2) {
@@ -448,7 +448,7 @@ public class Usermanagement {
.createQuery("select c from Userdata as c where c.user_id = :user_id AND c.data_key = :data_key AND c.deleted <> :deleted", Userdata.class);
query.setParameter("user_id", user_id.longValue());
query.setParameter("data_key", DATA_KEY);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
for (Iterator<Userdata> it2 = query.getResultList().iterator(); it2
.hasNext();) {
userdata = it2.next();
@@ -682,7 +682,7 @@ public class Usermanagement {
userdata.setUpdatetime(null);
userdata.setComment(Comment);
userdata.setUser_id(new Long(USER_ID));
- userdata.setDeleted("false");
+ userdata.setDeleted(false);
try {
userdata = em.merge(userdata);
ret = "success";
@@ -698,7 +698,7 @@ public class Usermanagement {
TypedQuery<Userlevel> query = em
.createQuery("select c from Userlevel as c where c.level_id = :level_id AND c.deleted <> :deleted", Userlevel.class);
query.setParameter("level_id", level_id.longValue());
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
for(Iterator<Userlevel> it2 = query.getResultList().iterator(); it2
.hasNext();) {
userlevel = it2.next();
@@ -726,7 +726,7 @@ public class Usermanagement {
}
TypedQuery<Users> query = em
- .createQuery("select c from Users as c where c.user_id = :user_id AND c.deleted <> 'true'", Users.class);
+ .createQuery("select c from Users as c where c.user_id = :user_id AND c.deleted <> true", Users.class);
query.setParameter("user_id", user_id);
Users us = null;
try {
@@ -757,7 +757,7 @@ public class Usermanagement {
}
TypedQuery<Users> query = em
- .createQuery("select c from Users as c where c.user_id = :user_id AND c.deleted <> 'true'", Users.class);
+ .createQuery("select c from Users as c where c.user_id = :user_id AND c.deleted <> true", Users.class);
query.setParameter("user_id", user_id);
Users us = null;
try {
@@ -1162,7 +1162,7 @@ public class Usermanagement {
users.setPassword(manageCryptStyle.getInstanceOfCrypt()
.createPassPhrase(userpass));
users.setRegdate(new Date());
- users.setDeleted("false");
+ users.setDeleted(false);
//new user add organizations without checks
if (orgIds != null) {
@@ -1192,7 +1192,7 @@ public class Usermanagement {
TypedQuery<Users> query = em.createQuery(hql, Users.class);
query.setParameter("externalUserId", externalUserId);
query.setParameter("externalUserType", externalUserType);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
List<Users> users = query.getResultList();
@@ -1274,7 +1274,7 @@ public class Usermanagement {
users.setPassword(manageCryptStyle.getInstanceOfCrypt()
.createPassPhrase(userpass));
users.setRegdate(new Date());
- users.setDeleted("false");
+ users.setDeleted(false);
users.setServer(serverDao.getServerWithMinimumUsers());
em.persist(users);
@@ -1333,7 +1333,7 @@ public class Usermanagement {
uslevel.setStarttime(new Date());
uslevel.setDescription(description);
uslevel.setStatuscode(new Integer(myStatus));
- uslevel.setDeleted("false");
+ uslevel.setDeleted(false);
em.merge(uslevel);
} catch (Exception ex2) {
log.error("[addUserLevel]", ex2);
@@ -1521,7 +1521,7 @@ public class Usermanagement {
CriteriaBuilder cb = em.getCriteriaBuilder();
CriteriaQuery<Users> cq = cb.createQuery(Users.class);
Root<Users> c = cq.from(Users.class);
- Predicate condition = cb.equal(c.get("deleted"), "false");
+ Predicate condition = cb.equal(c.get("deleted"), false);
Predicate subCondition = cb.equal(c.get("user_id"), id);
cq.where(condition, subCondition);
TypedQuery<Users> q = em.createQuery(cq);
@@ -1569,7 +1569,7 @@ public class Usermanagement {
CriteriaBuilder cb = em.getCriteriaBuilder();
CriteriaQuery<Users> cq = cb.createQuery(Users.class);
Root<Users> c = cq.from(Users.class);
- Predicate condition = cb.equal(c.get("deleted"), "false");
+ Predicate condition = cb.equal(c.get("deleted"), false);
Predicate subCondition = cb.equal(c.get("login"), login);
cq.where(condition, subCondition);
TypedQuery<Users> q = em.createQuery(cq);
@@ -1601,7 +1601,7 @@ public class Usermanagement {
TypedQuery<Users> query = em.createQuery(hql, Users.class);
query.setParameter("userOrEmail", userOrEmail);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
List<Users> ll = query.getResultList();
@@ -1754,7 +1754,7 @@ public class Usermanagement {
+ " AND u.deleted <> :deleted";
TypedQuery<Users> query = em.createQuery(hql, Users.class);
query.setParameter("activatehash", hash);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
Users u = null;
try {
u = query.getSingleResult();
@@ -1788,7 +1788,7 @@ public class Usermanagement {
if (authLevelManagement.checkAdminLevel(user_level)) {
String hql = "select c from Users c "
- + "where c.deleted = 'false' " + "AND ("
+ + "where c.deleted = false " + "AND ("
+ "lower(c.login) LIKE :search "
+ "OR lower(c.firstname) LIKE :search "
+ "OR lower(c.lastname) LIKE :search " + ")";
@@ -1838,7 +1838,7 @@ public class Usermanagement {
try {
String hql = "select c from Users c "
- + "where c.deleted = 'false' ";
+ + "where c.deleted = false ";
if (searchTxt.length() != 0 && userOffers.length() != 0
&& userSearchs.length() != 0) {
@@ -1987,7 +1987,7 @@ public class Usermanagement {
try {
String hql = "select count(c.user_id) from Users c "
- + "where c.deleted = 'false' ";
+ + "where c.deleted = false ";
if (searchTxt.length() != 0 && userOffers.length() != 0
&& userSearchs.length() != 0) {
@@ -2125,7 +2125,7 @@ public class Usermanagement {
try {
String hql = "select count(c.user_id) from Users c "
- + "where c.deleted = 'false' " + "AND " + "(" + "("
+ + "where c.deleted = false " + "AND " + "(" + "("
+ "lower(c.login) LIKE :search "
+ "OR lower(c.firstname) LIKE :search "
+ "OR lower(c.lastname) LIKE :search "
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/UserContactsDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/UserContactsDaoImpl.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/UserContactsDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/UserContactsDaoImpl.java Sun Jul 22 15:52:23 2012
@@ -159,7 +159,7 @@ public class UserContactsDaoImpl {
String hql = "select c from UserContacts c " +
"where c.owner.user_id = :ownerId " +
"AND c.pending = :pending " +
- "AND c.contact.deleted <> 'true'";
+ "AND c.contact.deleted <> true";
TypedQuery<UserContacts> query = em.createQuery(hql, UserContacts.class);
query.setParameter("ownerId", ownerId);
@@ -182,7 +182,7 @@ public class UserContactsDaoImpl {
+ "where c.contact.user_id = :userId "
+ "AND c.owner.user_id = :contactId "
+ "AND c.shareCalendar = :shareCalendar "
- + "AND c.contact.deleted <> 'true'";
+ + "AND c.contact.deleted <> true";
TypedQuery<UserContacts> query = em.createQuery(hql,
UserContacts.class);
@@ -207,7 +207,7 @@ public class UserContactsDaoImpl {
String hql = "select c from UserContacts c " +
"where c.contact.user_id = :contactId " +
"AND c.shareCalendar = :shareCalendar " +
- "AND c.contact.deleted <> 'true'";
+ "AND c.contact.deleted <> true";
TypedQuery<UserContacts> query = em.createQuery(hql, UserContacts.class);
query.setParameter("contactId", contactId);
@@ -228,7 +228,7 @@ public class UserContactsDaoImpl {
String hql = "select c from UserContacts c " +
"where c.contact.user_id = :user_id " +
"AND c.pending = :pending " +
- "AND c.contact.deleted <> 'true'";
+ "AND c.contact.deleted <> true";
TypedQuery<UserContacts> query = em.createQuery(hql, UserContacts.class);
query.setParameter("user_id", user_id);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/UsersDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/UsersDaoImpl.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/UsersDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/UsersDaoImpl.java Sun Jul 22 15:52:23 2012
@@ -97,11 +97,11 @@ public class UsersDaoImpl {
try {
if (USER_ID != 0) {
Users us = getUser(USER_ID);
- us.setDeleted("true");
+ us.setDeleted(true);
us.setUpdatetime(new Date());
Adresses adr = us.getAdresses();
if (adr != null) {
- adr.setDeleted("true");
+ adr.setDeleted(true);
}
if (us.getUser_id() == null) {
@@ -127,7 +127,7 @@ public class UsersDaoImpl {
public Long selectMaxFromUsers() {
try {
// get all users
- TypedQuery<Long> query = em.createQuery("select count(c.user_id) from Users c where c.deleted = 'false'", Long.class);
+ TypedQuery<Long> query = em.createQuery("select count(c.user_id) from Users c where c.deleted = false", Long.class);
List<Long> ll = query.getResultList();
log.info("selectMaxFromUsers" + ll.get(0));
return ll.get(0);
@@ -143,7 +143,7 @@ public class UsersDaoImpl {
CriteriaBuilder cb = em.getCriteriaBuilder();
CriteriaQuery<Users> cq = cb.createQuery(Users.class);
Root<Users> c = cq.from(Users.class);
- Predicate condition = cb.equal(c.get("deleted"), "false");
+ Predicate condition = cb.equal(c.get("deleted"), false);
cq.where(condition);
TypedQuery<Users> q = em.createQuery(cq);
List<Users> ll = q.getResultList();
@@ -174,7 +174,7 @@ public class UsersDaoImpl {
// log.debug("getUserContactsBySearch: "+ userId);
String hql = "select count(u.user_id) from Users u "
- + "WHERE u.deleted = 'false' ";
+ + "WHERE u.deleted = false ";
hql += "AND ( ";
for (int i = 0; i < searchItems.length; i++) {
@@ -221,7 +221,7 @@ public class UsersDaoImpl {
try {
TypedQuery<Users> query = em.createQuery("select c from Users as c where c.login = :DataValue AND c.deleted <> :deleted", Users.class);
query.setParameter("DataValue", DataValue);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
int count = query.getResultList().size();
if (count != 0) {
@@ -239,7 +239,7 @@ public class UsersDaoImpl {
+ " where u.login = :login" + " AND u.deleted <> :deleted";
TypedQuery<Users> query = em.createQuery(hql, Users.class);
query.setParameter("login", login);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
Users us = null;
try {
us = query.getSingleResult();
@@ -259,7 +259,7 @@ public class UsersDaoImpl {
+ " AND u.deleted <> :deleted";
TypedQuery<Users> query = em.createQuery(hql, Users.class);
query.setParameter("email", email);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
Users us = null;
try {
us = query.getSingleResult();
@@ -281,7 +281,7 @@ public class UsersDaoImpl {
+ " AND u.deleted <> :deleted";
TypedQuery<Users> query = em.createQuery(hql, Users.class);
query.setParameter("resethash", hash);
- query.setParameter("deleted", "true");
+ query.setParameter("deleted", true);
Users us = null;
try {
us = query.getSingleResult();
@@ -325,7 +325,7 @@ public class UsersDaoImpl {
try {
String hql = "select count(c.user_id) from Users c "
- + "where c.deleted = 'false' " + "AND ("
+ + "where c.deleted = false " + "AND ("
+ "lower(c.login) LIKE :search "
+ "OR lower(c.firstname) LIKE :search "
+ "OR lower(c.lastname) LIKE :search " + ")";
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java Sun Jul 22 15:52:23 2012
@@ -109,20 +109,20 @@ public class ImportInitvalues {
* ######################## Dashboard Menu Points
*/
navimanagement.addGlobalStructure("home", 1, 124, false, true, 1,
- "home", "false", 582L);
+ "home", false, 582L);
navimanagement.addMainStructure("dashboardModuleStartScreen", null, 1, 290,
- true, false, 1, "Dashboard Module", 1, "false", 1450L);
+ true, false, 1, "Dashboard Module", 1, false, 1450L);
navimanagement.addMainStructure("dashboardModuleCalendar", null, 2, 291,
- true, false, 1, "Module Calendar", 1, "false", 1451L);
+ true, false, 1, "Module Calendar", 1, false, 1451L);
/*
* ######################## Recording Menu Points - disabled by default
*/
navimanagement.addGlobalStructure("record", 2, 395, false, true, 1,
- "record", "false", 583L);
+ "record", false, 583L);
navimanagement.addMainStructure("recordModule", null, 1, 395, true, false, 1,
- "Module Recording Player", 2, "false", 1452L);
+ "Module Recording Player", 2, false, 1452L);
/*
* String action, int naviorder, long fieldvalues_id, boolean isleaf,
@@ -134,76 +134,76 @@ public class ImportInitvalues {
*/
navimanagement.addGlobalStructure("meetings", 3, 792, false, true, 1,
- "List of Conference Rooms Global Navi", "false", 793L);
+ "List of Conference Rooms Global Navi", false, 793L);
navimanagement.addMainStructure("conferenceModuleRoomList", "publicTabButton", 1, 777,
true, false, 1, "List of Conference Rooms Main Navi", 3,
- "false", 1506L);
+ false, 1506L);
navimanagement.addMainStructure("conferenceModuleRoomList", "privateTabButton", 2, 779,
true, false, 1, "List of Conference Rooms Main Navi", 3,
- "false", 1507L);
+ false, 1507L);
navimanagement.addMainStructure("conferenceModuleRoomList", "myTabButton", 3, 781,
true, false, 1, "List of Conference Rooms Main Navi", 3,
- "false", 1508L);
+ false, 1508L);
/*
* ######################## Event Menu Points
*/
navimanagement.addGlobalStructure("events", 4, 3, false, true, 1,
- "List of Event Rooms Global Navi", "true", 585L);
+ "List of Event Rooms Global Navi", true, 585L);
navimanagement.addMainStructure("eventModuleRoomList", null, 1, 3, true,
- false, 1, "List of Event Rooms Main Navi", 4, "false", null);
+ false, 1, "List of Event Rooms Main Navi", 4, false, null);
/*
* ######################## Moderation Menu Points - disabled by default
*/
navimanagement.addGlobalStructure("moderate", 5, 649L, false, true, 2,
- "Moderation Menu", "true", 660L);
+ "Moderation Menu", true, 660L);
navimanagement.addMainStructure("moderatorModuleUser", null, 1, 650, true,
- false, 1, "Moderate Users", 5, "false", null);
+ false, 1, "Moderate Users", 5, false, null);
navimanagement.addMainStructure("moderatorModuleRoom", null, 1, 651, true,
- false, 1, "Moderate Rooms", 5, "false", null);
+ false, 1, "Moderate Rooms", 5, false, null);
/*
* ######################## Administration Menu Points
*/
navimanagement.addGlobalStructure("admin", 6, 6, false, true, 3,
- "Administration Menu", "false", 586L);
+ "Administration Menu", false, 586L);
navimanagement.addMainStructure("adminModuleUser", null, 14, 125, true,
- false, 2, "Administration of Users", 6, "false", 1454L);
+ false, 2, "Administration of Users", 6, false, 1454L);
navimanagement.addMainStructure("adminModuleConnections", null, 15, 597,
- true, false, 3, "Aministration of Connections", 6, "false",
+ true, false, 3, "Aministration of Connections", 6, false,
1455L);
navimanagement.addMainStructure("adminModuleOrg", null, 16, 127, true, false,
- 3, "Administration of Organizations", 6, "false", 1456L);
+ 3, "Administration of Organizations", 6, false, 1456L);
navimanagement.addMainStructure("adminModuleRoom", null, 17, 186, true,
- false, 3, "Administration of Rooms", 6, "false", 1457L);
+ false, 3, "Administration of Rooms", 6, false, 1457L);
navimanagement.addMainStructure("adminModuleConfiguration", null, 18, 263,
- true, false, 3, "Administration of Configuration", 6, "false",
+ true, false, 3, "Administration of Configuration", 6, false,
1458L);
navimanagement.addMainStructure("adminModuleLanguages", null, 19, 348, true,
- false, 3, "Administration of Languages", 6, "false", 1459L);
+ false, 3, "Administration of Languages", 6, false, 1459L);
navimanagement.addMainStructure("adminModuleLDAP", null, 20, 1103, true,
- false, 3, "Administration of LDAP Configs", 6, "false", 1460L);
+ false, 3, "Administration of LDAP Configs", 6, false, 1460L);
navimanagement.addMainStructure("adminModuleBackup", null, 21, 367, true,
- false, 3, "Administration of Backups", 6, "false", 1461L);
+ false, 3, "Administration of Backups", 6, false, 1461L);
navimanagement.addMainStructure("adminModuleServers", null, 22, 1498, true,
- false, 3, "Administration of Servers", 6, "false", 1499L);
+ false, 3, "Administration of Servers", 6, false, 1499L);
log.debug("MainMenu ADDED");
errorManagement.addErrorType(new Long(1), new Long(322));
@@ -979,7 +979,7 @@ public class ImportInitvalues {
flv.setValue(value);
flv.setLanguage_id(lang.getLanguage_id());
flv.setFieldvalues(fv);
- flv.setDeleted("false");
+ flv.setDeleted(false);
flvMap.put(id, flv);
}
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/Adresses.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/Adresses.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/Adresses.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/Adresses.java Sun Jul 22 15:52:23 2012
@@ -62,7 +62,7 @@ public class Adresses implements Seriali
@Column(name = "zip")
private String zip;
@Column(name = "deleted")
- private String deleted;
+ private boolean deleted;
@Column(name = "email")
private String email;
@@ -153,11 +153,11 @@ public class Adresses implements Seriali
this.zip = zip;
}
- 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/adresses/States.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/States.java?rev=1364338&r1=1364337&r2=1364338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/States.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/States.java Sun Jul 22 15:52:23 2012
@@ -43,7 +43,7 @@ public class States implements Serializa
@Column(name = "updatetime")
private Date updatetime;
@Column(name = "deleted")
- private String deleted;
+ private boolean deleted;
@Column(name = "shortName")
private String shortName;
@Column(name = "code")
@@ -81,11 +81,11 @@ public class States implements Serializa
this.updatetime = updatetime;
}
- public String getDeleted() {
+ public boolean getDeleted() {
return deleted;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(boolean deleted) {
this.deleted = deleted;
}