Author: sebawagner
Date: Sun Aug 11 02:26:31 2013
New Revision: 1512852
URL: http://svn.apache.org/r1512852
Log:
OPENMEETINGS-758 Remove language editor admin Flash UI and Server Side related
API
Removed:
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/languageseditor/
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/test/labels/TestLabels.java
Modified:
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/library.lzx
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/basic/FieldLanguageDao.java
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/basic/FieldManager.java
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/LanguageService.java
Modified:
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/library.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/library.lzx?rev=1512852&r1=1512851&r2=1512852&view=diff
==============================================================================
---
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/library.lzx
(original)
+++
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/library.lzx
Sun Aug 11 02:26:31 2013
@@ -26,7 +26,6 @@
<include href="useradmin/" />
<include href="orgadmin/" />
<include href="roomadmin/" />
- <include href="languageseditor/" />
<include href="ldap/" />
<!-- -->
<include href="servers/" />
Modified:
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/basic/FieldLanguageDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/basic/FieldLanguageDao.java?rev=1512852&r1=1512851&r2=1512852&view=diff
==============================================================================
---
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/basic/FieldLanguageDao.java
(original)
+++
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/basic/FieldLanguageDao.java
Sun Aug 11 02:26:31 2013
@@ -87,24 +87,6 @@ public class FieldLanguageDao implements
}
}
- public Long updateFieldLanguage(Long language_id, String langName,
- String code, boolean deleted) {
- try {
- FieldLanguage fl =
this.getFieldLanguageById(language_id);
- fl.setUpdatetime(new Date());
- if (langName.length() > 0)
- fl.setName(langName);
- if (code.length() > 0)
- fl.setCode(code);
- fl.setDeleted(deleted);
- this.updateLanguage(fl);
- return language_id;
- } catch (Exception ex2) {
- log.error("[updateLanguage]: ", ex2);
- }
- return new Long(-1);
- }
-
public void delete(FieldLanguage fl) {
fl.setUpdatetime(new Date());
fl.setDeleted(true);
Modified:
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/basic/FieldManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/basic/FieldManager.java?rev=1512852&r1=1512851&r2=1512852&view=diff
==============================================================================
---
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/basic/FieldManager.java
(original)
+++
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/basic/FieldManager.java
Sun Aug 11 02:26:31 2013
@@ -33,7 +33,6 @@ import javax.persistence.TypedQuery;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.beans.basic.SearchResult;
import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
import org.apache.openmeetings.persistence.beans.lang.Fieldvalues;
@@ -160,23 +159,6 @@ public class FieldManager {
return null;
}
- public Long deleteFieldlanguagesvaluesById(Long
fieldlanguagesvalues_id) {
- try {
- Fieldlanguagesvalues flv = this
-
.getFieldlanguagesvaluesById(fieldlanguagesvalues_id);
- if (flv == null) {
- return new Long(-27);
- }
-
- flv = em.find(Fieldlanguagesvalues.class,
fieldlanguagesvalues_id);
-
- return new Long(-28);
- } catch (Exception ex2) {
- log.error("[getFieldByIdAndLanguage]: ", ex2);
- }
- return new Long(-1);
- }
-
public List<Fieldlanguagesvalues> getAllFieldsByLanguage(Long
language_id) {
try {
@@ -398,168 +380,10 @@ public class FieldManager {
return q1.getResultList();
}
- public Fieldvalues getFieldvaluesById(Long fieldvalues_id, Long
language_id) {
- try {
- // log.error("Long fieldvalues_id, Long language_id
"+fieldvalues_id+" || "+language_id);
- Fieldvalues fv =
this.getFieldvaluesById(fieldvalues_id);
- fv.setFieldlanguagesvalue(this.getFieldByIdAndLanguage(
- fieldvalues_id, language_id));
- return fv;
- } catch (Exception e) {
- log.error("[getFieldvaluesById] ", e);
- }
- return null;
- }
-
- /**
- * update given Field and its Label by IDs
- *
- * @param fieldvalues_id
- * @param name
- * @param fieldlanguagesvalues_id
- * @param value
- * @return
- */
- public Long updateLabel(Long fieldvalues_id, String name,
- Long fieldlanguagesvalues_id, String value) {
- try {
- Fieldvalues fv =
this.getFieldvaluesById(fieldvalues_id);
- if (fv == null) {
- return new Long(-24);
- } else {
- fv.setName(name);
- fv.setUpdatetime(new Date());
- this.updateField(fv);
- }
- Fieldlanguagesvalues flv = this
-
.getFieldlanguagesvaluesById(fieldlanguagesvalues_id);
- if (flv == null) {
- return new Long(-25);
- } else {
- flv.setUpdatetime(new Date());
- flv.setValue(value);
- this.updateFieldLanguagesLabel(flv);
- }
- return fieldvalues_id;
- } catch (Exception ex2) {
- log.error("[updateFieldLanguagesLabel]: ", ex2);
- }
- return new Long(-1);
- }
-
- public Long addAndUpdateLabel(Long fieldvalues_id, String name,
- String value, Long language_id) {
- try {
- Fieldvalues fv =
this.getFieldvaluesById(fieldvalues_id);
- if (fv == null) {
- return new Long(-24);
- } else {
- fv.setName(name);
- fv.setUpdatetime(new Date());
- this.updateField(fv);
- }
- this.addFieldValueByFieldAndLanguage(fv, language_id,
- value);
- return fieldvalues_id;
- } catch (Exception ex2) {
- log.error("[updateFieldLanguagesLabel]: ", ex2);
- }
- return new Long(-1);
- }
-
public long getNextFieldvaluesId() {
return fieldLanguagesValuesDAO.count() + 1;
}
- public Long addFieldAndLabel(String name, String value, Long
language_id) {
- try {
- Fieldvalues fv = addFieldById(name,
getNextFieldvaluesId());
- if (fv.getFieldvalues_id() > 0) {
- this.addFieldValueByFieldAndLanguage(fv,
- language_id, value);
- return fv.getFieldvalues_id();
- } else {
- return -1L;
- }
- } catch (Exception ex2) {
- log.error("[updateFieldLanguagesLabel]: ", ex2);
- }
- return -1L;
- }
-
- public SearchResult<Fieldvalues> getFieldsByLanguage(int start, int
max, String orderby,
- boolean asc, Long language_id, String search) {
- try {
- SearchResult<Fieldvalues> sresult = new
SearchResult<Fieldvalues>();
-
sresult.setObjectName(Fieldlanguagesvalues.class.getName());
-
sresult.setRecords(this.selectMaxFromFieldsValues(search));
- sresult.setResult(this.getMixedFieldValuesList(start,
max, orderby,
- asc, language_id, search));
- return sresult;
- } catch (Exception ex2) {
- log.error("[getFieldsByLanguage]: ", ex2);
- }
- return null;
- }
-
- private Long selectMaxFromFieldsValues(String search) throws Exception {
- 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)";
- }
- TypedQuery<Long> query = em
- .createQuery(queryLanguage, Long.class);
- if (search.length()>0) {
- query.setParameter("searchStr", "%"+search+"%");
- long idNumber = 0;
- try {
- idNumber = Long.parseLong(search);
- } catch (NumberFormatException nfe) {
- }
- query.setParameter("fieldvalues_id", idNumber);
- }
- return query.getResultList().get(0);
- }
-
- private List<Fieldvalues> getMixedFieldValuesList(int start, int max,
- String orderby, boolean asc, Long language_id, String
search) throws Exception {
- List<Fieldvalues> fvList = this.getFieldsValues(start, max,
orderby, asc, search);
- for (Fieldvalues fv : fvList) {
- fv.setFieldlanguagesvalue(this.getFieldByIdAndLanguage(
- fv.getFieldvalues_id(), language_id));
- }
- return fvList;
- }
-
- 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";
- if (search.length()>0) {
- queryLanguage += " AND (c.name LIKE :searchStr " +
- "OR c.fieldvalues_id =
:fieldvalues_id)";
- }
- if (asc) {
- queryLanguage += " ORDER BY "+orderby+ " ASC";
- } else {
- queryLanguage += " ORDER BY "+orderby + "DESC";
- }
- TypedQuery<Fieldvalues> q = em
- .createQuery(queryLanguage, Fieldvalues.class);
- if (search.length()>0) {
- q.setParameter("searchStr", "%"+search+"%");
- long idNumber = 0;
- try {
- idNumber = Long.parseLong(search);
- } catch (NumberFormatException nfe) {
- }
- q.setParameter("fieldvalues_id", idNumber);
- }
- q.setFirstResult(start);
- q.setMaxResults(max);
- return q.getResultList();
- }
-
public Fieldvalues getFieldvaluesById(Long fieldvalues_id) {
String hql = "select f from Fieldvalues f WHERE
f.fieldvalues_id = :fieldvalues_id ";
TypedQuery<Fieldvalues> query = em.createQuery(hql,
Fieldvalues.class);
@@ -572,11 +396,6 @@ public class FieldManager {
return fv;
}
- private Fieldlanguagesvalues getFieldlanguagesvaluesById(
- Long fieldlanguagesvalues_id) throws Exception {
- return
performReplace(fieldLanguagesValuesDAO.get(fieldlanguagesvalues_id));
- }
-
private Fieldlanguagesvalues performReplace(Fieldlanguagesvalues f) {
String appName = configurationDaoImpl.getAppName();
return performReplace(f, appName);
@@ -607,25 +426,4 @@ public class FieldManager {
return flv;
}
- private void updateField(Fieldvalues fv) throws Exception {
- if (fv.getFieldvalues_id() == null) {
- em.persist(fv);
- } else {
- if (!em.contains(fv)) {
- em.merge(fv);
- }
- }
- }
-
- private void updateFieldLanguagesLabel(Fieldlanguagesvalues flv)
- throws Exception {
- if (flv.getFieldlanguagesvalues_id() == null) {
- em.persist(flv);
- } else {
- if (!em.contains(flv)) {
- em.merge(flv);
- }
- }
- }
-
}
Modified:
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/LanguageService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/LanguageService.java?rev=1512852&r1=1512851&r2=1512852&view=diff
==============================================================================
---
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/LanguageService.java
(original)
+++
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/LanguageService.java
Sun Aug 11 02:26:31 2013
@@ -20,7 +20,6 @@ package org.apache.openmeetings.remote;
import static
org.apache.openmeetings.persistence.beans.basic.Configuration.DEFAUT_LANG_KEY;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -30,11 +29,9 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.data.basic.FieldManager;
import org.apache.openmeetings.data.basic.SessiondataDao;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.beans.basic.SearchResult;
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
-import org.apache.openmeetings.persistence.beans.lang.Fieldvalues;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -62,9 +59,7 @@ public class LanguageService {
private AuthLevelUtil authLevelUtil;
/**
- * get a List of all availaible Languages
- *
- * @return - List of all availaible Languages
+ * @return - List of all available Languages
*/
public List<FieldLanguage> getLanguages() {
return fieldLanguageDaoImpl.getLanguages();
@@ -97,123 +92,5 @@ public class LanguageService {
return fieldManager.getLabelsByLanguage(language_id, start,
max);
}
- public Fieldvalues getFieldvalueById(String SID, Long fieldvalues_id,
- Long language_id) {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- if (authLevelUtil.checkAdminLevel(user_level)) {
- return fieldManager.getFieldvaluesById(fieldvalues_id,
- language_id);
- }
- return null;
- }
-
- public Long addLanguage(String SID, String langName, String code) {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- if (authLevelUtil.checkAdminLevel(user_level)) {
- if (langName.length() == 0)
- return new Long(-30);
- FieldLanguage lang =
fieldLanguageDaoImpl.addLanguage(0, langName, false, code);
- return lang != null ? lang.getLanguage_id() : -1;
- }
- return null;
- }
-
- public Long updateLanguage(String SID, Long language_id, String
langName, String code) {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- if (authLevelUtil.checkAdminLevel(user_level)) {
- if (langName.length() == 0)
- return new Long(-30);
- return
fieldLanguageDaoImpl.updateFieldLanguage(language_id,
- langName, code, false);
- }
- return null;
- }
-
- public Long deleteLanguage(String SID, Long language_id) {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- if (authLevelUtil.checkAdminLevel(user_level)) {
- return
fieldLanguageDaoImpl.updateFieldLanguage(language_id, "",
- "", true);
- }
- return null;
- }
-
- public Long deleteFieldlanguagesvaluesById(String SID,
- Long fieldlanguagesvalues_id) {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- if (authLevelUtil.checkAdminLevel(user_level)) {
- return fieldManager
-
.deleteFieldlanguagesvaluesById(fieldlanguagesvalues_id);
- }
- return null;
- }
-
- /**
- *
- * @param SID
- * @param start
- * @param max
- * @param orderby
- * @param asc
- * @param language_id
- * @return - the list of field values being searched in case of
success, null otherwise
- */
- public SearchResult<Fieldvalues> getFieldsByLanguage(String SID, int
start, int max,
- String orderby, boolean asc, Long language_id, String
search) {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- if (authLevelUtil.checkAdminLevel(user_level)) {
- return fieldManager.getFieldsByLanguage(start, max,
orderby, asc,
- language_id, search);
- }
- return null;
- }
-
- /**
- *
- * @param SID
- * @param values
- * @return - id of the label added or updated in case of success, error
code otherwise
- */
- public Long saveOrUpdateLabel(String SID,
- LinkedHashMap<Object, Object> values) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level =
userManager.getUserLevelByID(users_id);
- Long fieldvalues_id = Long.valueOf(
-
values.get("fieldvalues_id").toString()).longValue();
- String name = values.get("name").toString();
- Long fieldlanguagesvalues_id = Long.valueOf(
-
values.get("fieldlanguagesvalues_id").toString())
- .longValue();
- Long language_id = Long.valueOf(
-
values.get("language_id").toString()).longValue();
- String value = values.get("value").toString();
- if (authLevelUtil.checkAdminLevel(user_level)) {
- if (fieldvalues_id > 0 &&
fieldlanguagesvalues_id > 0) {
- log.error("UPDATE LABEL");
- return
fieldManager.updateLabel(fieldvalues_id, name,
-
fieldlanguagesvalues_id, value);
- } else if (fieldvalues_id > 0 &&
fieldlanguagesvalues_id == 0) {
- log.error("INSERT NEW LABEL");
- return
fieldManager.addAndUpdateLabel(fieldvalues_id,
- name, value,
language_id);
- } else {
- log.error("INSERT NEW FIELD AND LABEL");
- return
fieldManager.addFieldAndLabel(name, value,
- language_id);
- }
- }
- return new Long(-26);
- } catch (Exception e) {
- log.error("[saveOrUpdateLabel]", e);
- }
- return new Long(-1);
- }
}
