Author: seba.wagner
Date: Mon Dec 29 09:36:34 2008
New Revision: 1748
Added:
trunk/webapp/src/app/org/openmeetings/app/data/basic/FieldLanguageDaoImpl.java
(contents, props changed)
- copied, changed from r1747,
/trunk/webapp/src/app/org/openmeetings/app/data/basic/Languagemanagement.java
Removed:
trunk/webapp/src/app/org/openmeetings/app/data/basic/Languagemanagement.java
Modified:
trunk/webapp/filetest.keystore
trunk/webapp/src/app/org/openmeetings/app/data/basic/Fieldmanagment.java
trunk/webapp/src/app/org/openmeetings/app/data/basic/Navimanagement.java
trunk/webapp/src/app/org/openmeetings/app/data/calendar/daos/MeetingMemberDaoImpl.java
trunk/webapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
trunk/webapp/src/app/org/openmeetings/app/remote/LanguageService.java
trunk/webapp/src/app/org/openmeetings/app/xmlimport/LanguageImport.java
trunk/webapp/src/app/org/openmeetings/servlet/outputhandler/LangExport.java
trunk/webapp/src/test/org/openmeetings/test/basic/StartUpData.java
trunk/webapp/src/test/org/openmeetings/test/basic/StartUpLanguageFieldsConference.java
trunk/webapp/src/test/org/openmeetings/test/init/AdddefaultLanugages.java
Log:
Fixes:
Add boolean lang to add right to left languages Issue 579
Modified: trunk/webapp/filetest.keystore
==============================================================================
Binary files. No diff available.
Copied:
trunk/webapp/src/app/org/openmeetings/app/data/basic/FieldLanguageDaoImpl.java
(from r1747,
/trunk/webapp/src/app/org/openmeetings/app/data/basic/Languagemanagement.java)
==============================================================================
---
/trunk/webapp/src/app/org/openmeetings/app/data/basic/Languagemanagement.java
(original)
+++
trunk/webapp/src/app/org/openmeetings/app/data/basic/FieldLanguageDaoImpl.java
Mon Dec 29 09:36:34 2008
@@ -18,18 +18,18 @@
* @author sebastianwagner
*
*/
-public class Languagemanagement {
+public class FieldLanguageDaoImpl {
- private static final Logger log =
LoggerFactory.getLogger(Languagemanagement.class);
+ private static final Logger log =
LoggerFactory.getLogger(FieldLanguageDaoImpl.class);
- private Languagemanagement() {
+ private FieldLanguageDaoImpl() {
}
- private static Languagemanagement instance = null;
+ private static FieldLanguageDaoImpl instance = null;
- public static synchronized Languagemanagement getInstance() {
+ public static synchronized FieldLanguageDaoImpl getInstance() {
if (instance == null) {
- instance = new Languagemanagement();
+ instance = new FieldLanguageDaoImpl();
}
return instance;
}
Modified:
trunk/webapp/src/app/org/openmeetings/app/data/basic/Fieldmanagment.java
==============================================================================
---
trunk/webapp/src/app/org/openmeetings/app/data/basic/Fieldmanagment.java
(original)
+++
trunk/webapp/src/app/org/openmeetings/app/data/basic/Fieldmanagment.java
Mon Dec 29 09:36:34 2008
@@ -1,6 +1,7 @@
package org.openmeetings.app.data.basic;
import java.util.Date;
+import java.util.LinkedList;
import java.util.List;
import java.util.Iterator;
@@ -39,6 +40,52 @@
}
return instance;
}
+
+ //Reflect the Reverse Order!!
+ public Fieldlanguagesvalues getFieldByIdAndLanguageByNavi(Long
fieldvalues_id, Long language_id) {
+ try {
+ Object idf = HibernateUtil.createSession();
+ Session session = HibernateUtil.getSession();
+ Transaction tx = session.beginTransaction();
+ Query query = session.createQuery("select f from
Fieldlanguagesvalues f
WHERE f.language_id = :language_id AND f.fieldvalues_id = :fieldvalues_id");
+ query.setLong("fieldvalues_id", fieldvalues_id);
+ query.setLong("language_id", language_id);
+ Fieldlanguagesvalues flv = (Fieldlanguagesvalues)
query.uniqueResult();
+ tx.commit();
+ HibernateUtil.closeSession(idf);
+
+ FieldLanguage fieldLanguage =
FieldLanguageDaoImpl.getInstance().getFieldLanguageById(language_id);
+
+ //Check for Right To Left Languages
+ if (fieldLanguage.getRtl()) {
+ Fieldlanguagesvalues remote = flv;
+ Fieldlanguagesvalues toAdd = new
Fieldlanguagesvalues();
+
toAdd.setFieldlanguagesvalues_id(remote.getFieldlanguagesvalues_id());
+
toAdd.setFieldvalues_id(remote.getFieldvalues_id());
+ toAdd.setLanguage_id(remote.getLanguage_id());
+
+ String[] splitted = remote.getValue().split("
");
+ String reverseOrder = "";
+ for (int i=splitted.length-1;i>=0;i--) {
+ reverseOrder += splitted[i];
+ if (splitted.length != 1) {
+ reverseOrder += " ";
+ }
+ }
+ toAdd.setValue(reverseOrder);
+
+ return toAdd;
+ } else {
+ return flv;
+ }
+
+ } catch (HibernateException ex) {
+ log.error("[getFieldByIdAndLanguage]: " + ex);
+ } catch (Exception ex2) {
+ log.error("[getFieldByIdAndLanguage]: " + ex2);
+ }
+ return null;
+ }
public Fieldlanguagesvalues getFieldByIdAndLanguage(Long
fieldvalues_id,
Long language_id) {
try {
@@ -133,8 +180,42 @@
//
log.debug("IDs: "+flang.getFieldlanguagesvalues_id()+"
"+flang.getFieldvalues_id());
//
// }
+
+ FieldLanguage fieldLanguage =
FieldLanguageDaoImpl.getInstance().getFieldLanguageById(language_id);
- return returnList;
+ //Check for Right To Left Languages
+ if (fieldLanguage.getRtl()) {
+
+ List<Fieldlanguagesvalues> returnRtlList = new
LinkedList<Fieldlanguagesvalues>();
+
+ for (Iterator<Fieldlanguagesvalues> iter =
returnList.iterator();iter.hasNext();) {
+ Fieldlanguagesvalues remote =
iter.next();
+ Fieldlanguagesvalues toAdd = new
Fieldlanguagesvalues();
+
toAdd.setFieldlanguagesvalues_id(remote.getFieldlanguagesvalues_id());
+
toAdd.setFieldvalues_id(remote.getFieldvalues_id());
+
toAdd.setLanguage_id(remote.getLanguage_id());
+
+ String[] splitted =
remote.getValue().split(" ");
+ String reverseOrder = "";
+ for (int i=splitted.length-1;i>=0;i--) {
+ reverseOrder += splitted[i];
+ if (splitted.length != 1) {
+ reverseOrder += " ";
+ }
+ }
+ toAdd.setValue(reverseOrder);
+
+ returnRtlList.add(toAdd);
+ }
+
+ return returnRtlList;
+ } else {
+
+ return returnList;
+
+ }
+
+
} catch (HibernateException ex) {
log.error("[getConfKey]: " + ex);
} catch (Exception ex2) {
Modified:
trunk/webapp/src/app/org/openmeetings/app/data/basic/Navimanagement.java
==============================================================================
---
trunk/webapp/src/app/org/openmeetings/app/data/basic/Navimanagement.java
(original)
+++
trunk/webapp/src/app/org/openmeetings/app/data/basic/Navimanagement.java
Mon Dec 29 09:36:34 2008
@@ -37,14 +37,14 @@
List ll = this.getMainMenu(user_level, USER_ID);
for (Iterator it2 = ll.iterator(); it2.hasNext();) {
Naviglobal navigl = (Naviglobal) it2.next();
-
navigl.setLabel(Fieldmanagment.getInstance().getFieldByIdAndLanguage(navigl.getFieldvalues_id(),language_id));
+
navigl.setLabel(Fieldmanagment.getInstance().getFieldByIdAndLanguageByNavi(navigl.getFieldvalues_id(),language_id));
Set s = navigl.getMainnavi();
for (Iterator it3 = s.iterator(); it3.hasNext();) {
Navimain navim = (Navimain) it3.next();
-
navim.setLabel(Fieldmanagment.getInstance().getFieldByIdAndLanguage(navim.getFieldvalues_id(),language_id));
+
navim.setLabel(Fieldmanagment.getInstance().getFieldByIdAndLanguageByNavi(navim.getFieldvalues_id(),language_id));
for (Iterator it4 =
navim.getSubnavi().iterator(); it4.hasNext();) {
Navisub navis = (Navisub) it4.next();
-
navis.setLabel(Fieldmanagment.getInstance().getFieldByIdAndLanguage(navis.getFieldvalues_id(),language_id));
+
navis.setLabel(Fieldmanagment.getInstance().getFieldByIdAndLanguageByNavi(navis.getFieldvalues_id(),language_id));
}
}
Modified:
trunk/webapp/src/app/org/openmeetings/app/data/calendar/daos/MeetingMemberDaoImpl.java
==============================================================================
---
trunk/webapp/src/app/org/openmeetings/app/data/calendar/daos/MeetingMemberDaoImpl.java
(original)
+++
trunk/webapp/src/app/org/openmeetings/app/data/calendar/daos/MeetingMemberDaoImpl.java
Mon Dec 29 09:36:34 2008
@@ -10,7 +10,7 @@
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.app.data.basic.Languagemanagement;
+import org.openmeetings.app.data.basic.FieldLanguageDaoImpl;
import org.openmeetings.app.data.user.Addressmanagement;
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.hibernate.beans.adresses.Adresses;
Modified:
trunk/webapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
==============================================================================
---
trunk/webapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
(original)
+++
trunk/webapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Mon Dec 29 09:36:34 2008
@@ -13,7 +13,7 @@
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.ErrorManagement;
import org.openmeetings.app.data.basic.Fieldmanagment;
-import org.openmeetings.app.data.basic.Languagemanagement;
+import org.openmeetings.app.data.basic.FieldLanguageDaoImpl;
import org.openmeetings.app.data.basic.Navimanagement;
import org.openmeetings.app.data.conference.Roommanagement;
import org.openmeetings.app.data.user.Organisationmanagement;
@@ -374,7 +374,7 @@
String langName = (String) lang.get("name");
Boolean langRtl = (Boolean) lang.get("rtl");
- Long languages_id =
Languagemanagement.getInstance().addLanguage(langName,langRtl);
+ Long languages_id =
FieldLanguageDaoImpl.getInstance().addLanguage(langName,langRtl);
SAXReader reader = new SAXReader();
Document document = reader.read(filePath + langName +
".xml");
Modified:
trunk/webapp/src/app/org/openmeetings/app/remote/LanguageService.java
==============================================================================
--- trunk/webapp/src/app/org/openmeetings/app/remote/LanguageService.java
(original)
+++ trunk/webapp/src/app/org/openmeetings/app/remote/LanguageService.java
Mon Dec 29 09:36:34 2008
@@ -7,7 +7,7 @@
import org.slf4j.LoggerFactory;
import org.openmeetings.app.data.basic.AuthLevelmanagement;
import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.app.data.basic.Languagemanagement;
+import org.openmeetings.app.data.basic.FieldLanguageDaoImpl;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.data.basic.Fieldmanagment;
@@ -29,7 +29,7 @@
* @return
*/
public List getLanguages(){
- return Languagemanagement.getInstance().getLanguages();
+ return FieldLanguageDaoImpl.getInstance().getLanguages();
}
/**
@@ -71,7 +71,7 @@
Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
if (AuthLevelmanagement.getInstance().checkAdminLevel(user_level))
{
if (langName.length()==0) return new Long(-30);
- return
Languagemanagement.getInstance().addLanguage(langName,false);
+ return
FieldLanguageDaoImpl.getInstance().addLanguage(langName,false);
}
return null;
}
@@ -81,7 +81,7 @@
Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
if (AuthLevelmanagement.getInstance().checkAdminLevel(user_level))
{
if (langName.length()==0) return new Long(-30);
- return
Languagemanagement.getInstance().updateFieldLanguage(language_id,
langName, "false");
+ return
FieldLanguageDaoImpl.getInstance().updateFieldLanguage(language_id,
langName, "false");
}
return null;
}
@@ -90,7 +90,7 @@
Long users_id = Sessionmanagement.getInstance().checkSession(SID);
Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
if (AuthLevelmanagement.getInstance().checkAdminLevel(user_level))
{
- return
Languagemanagement.getInstance().updateFieldLanguage(language_id, "", "true");
+ return
FieldLanguageDaoImpl.getInstance().updateFieldLanguage(language_id, "", "true");
}
return null;
}
Modified:
trunk/webapp/src/app/org/openmeetings/app/xmlimport/LanguageImport.java
==============================================================================
--- trunk/webapp/src/app/org/openmeetings/app/xmlimport/LanguageImport.java
(original)
+++ trunk/webapp/src/app/org/openmeetings/app/xmlimport/LanguageImport.java
Mon Dec 29 09:36:34 2008
@@ -10,7 +10,7 @@
import org.dom4j.io.SAXReader;
import org.openmeetings.app.data.basic.Fieldmanagment;
-import org.openmeetings.app.data.basic.Languagemanagement;
+import org.openmeetings.app.data.basic.FieldLanguageDaoImpl;
import org.openmeetings.app.hibernate.beans.lang.FieldLanguage;
import org.openmeetings.app.hibernate.beans.lang.Fieldvalues;
import org.openmeetings.app.hibernate.beans.lang.Fieldlanguagesvalues;
@@ -32,7 +32,7 @@
public Long addLanguageByDocument(Long language_id, InputStream is)
throws Exception {
//return null if no language availible
- if
(Languagemanagement.getInstance().getFieldLanguageById(language_id)==null) {
+ if
(FieldLanguageDaoImpl.getInstance().getFieldLanguageById(language_id)==null)
{
return null;
}
Modified:
trunk/webapp/src/app/org/openmeetings/servlet/outputhandler/LangExport.java
==============================================================================
---
trunk/webapp/src/app/org/openmeetings/servlet/outputhandler/LangExport.java
(original)
+++
trunk/webapp/src/app/org/openmeetings/servlet/outputhandler/LangExport.java
Mon Dec 29 09:36:34 2008
@@ -22,7 +22,7 @@
import org.slf4j.LoggerFactory;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.user.Usermanagement;
-import org.openmeetings.app.data.basic.Languagemanagement;
+import org.openmeetings.app.data.basic.FieldLanguageDaoImpl;
import org.openmeetings.app.hibernate.beans.lang.FieldLanguage;
import org.openmeetings.app.hibernate.beans.lang.Fieldvalues;
import org.openmeetings.app.data.basic.Fieldmanagment;
@@ -68,7 +68,7 @@
log.debug("user_level: "+user_level);
if (user_level!=null && user_level > 0) {
- FieldLanguage fl =
Languagemanagement.getInstance().getFieldLanguageById(language_id);
+ FieldLanguage fl =
FieldLanguageDaoImpl.getInstance().getFieldLanguageById(language_id);
List<Fieldvalues> fvList =
Fieldmanagment.getInstance().getMixedFieldValuesList(language_id);
Modified: trunk/webapp/src/test/org/openmeetings/test/basic/StartUpData.java
==============================================================================
--- trunk/webapp/src/test/org/openmeetings/test/basic/StartUpData.java
(original)
+++ trunk/webapp/src/test/org/openmeetings/test/basic/StartUpData.java Mon
Dec 29 09:36:34 2008
@@ -2,7 +2,7 @@
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Fieldmanagment;
-import org.openmeetings.app.data.basic.Languagemanagement;
+import org.openmeetings.app.data.basic.FieldLanguageDaoImpl;
import org.openmeetings.app.data.basic.Navimanagement;
import org.openmeetings.app.data.user.Organisationmanagement;
import org.openmeetings.app.data.user.Statemanagement;
Modified:
trunk/webapp/src/test/org/openmeetings/test/basic/StartUpLanguageFieldsConference.java
==============================================================================
---
trunk/webapp/src/test/org/openmeetings/test/basic/StartUpLanguageFieldsConference.java
(original)
+++
trunk/webapp/src/test/org/openmeetings/test/basic/StartUpLanguageFieldsConference.java
Mon Dec 29 09:36:34 2008
@@ -1,7 +1,7 @@
package org.openmeetings.test.basic;
import org.openmeetings.app.data.basic.Fieldmanagment;
-import org.openmeetings.app.data.basic.Languagemanagement;
+import org.openmeetings.app.data.basic.FieldLanguageDaoImpl;
import junit.framework.TestCase;
@@ -46,7 +46,7 @@
/** Read all languages files */
for (int i = 0; i < listLanguages.length ; i ++)
{
-
Languagemanagement.getInstance().addLanguage(listLanguages[i],false);
+
FieldLanguageDaoImpl.getInstance().addLanguage(listLanguages[i],false);
nodeListLanguages[i] =
getLanguageXmlFile(listLanguages[i]);
}
Modified:
trunk/webapp/src/test/org/openmeetings/test/init/AdddefaultLanugages.java
==============================================================================
---
trunk/webapp/src/test/org/openmeetings/test/init/AdddefaultLanugages.java
(original)
+++
trunk/webapp/src/test/org/openmeetings/test/init/AdddefaultLanugages.java
Mon Dec 29 09:36:34 2008
@@ -2,7 +2,7 @@
import junit.framework.TestCase;
-import org.openmeetings.app.data.basic.Languagemanagement;
+import org.openmeetings.app.data.basic.FieldLanguageDaoImpl;
public class AdddefaultLanugages extends TestCase {
@@ -12,9 +12,9 @@
public void testAdddefaultLanugages(){
- Languagemanagement.getInstance().addLanguage("deutsch",false);
- Languagemanagement.getInstance().addLanguage("english",false);
- Languagemanagement.getInstance().addLanguage("french",false);
+ FieldLanguageDaoImpl.getInstance().addLanguage("deutsch",false);
+ FieldLanguageDaoImpl.getInstance().addLanguage("english",false);
+ FieldLanguageDaoImpl.getInstance().addLanguage("french",false);
}
}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
