Author: solomax
Date: Mon May 28 04:00:12 2012
New Revision: 1343134
URL: http://svn.apache.org/viewvc?rev=1343134&view=rev
Log:
OPENMEETINGS-296 fixed
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.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/servlet/outputhandler/LangExport.java
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=1343134&r1=1343133&r2=1343134&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
Mon May 28 04:00:12 2012
@@ -387,9 +387,9 @@ public class Fieldmanagment {
return null;
}
- public List<Fieldvalues> getMixedFieldValuesList(Long language_id)
+ public List<Fieldlanguagesvalues> getMixedFieldValuesList(Long
language_id)
throws Exception {
- TypedQuery<Fieldvalues> q =
em.createNamedQuery("getFieldvaluesByLanguage", Fieldvalues.class);
+ TypedQuery<Fieldlanguagesvalues> q =
em.createNamedQuery("allFieldLanguageValues", Fieldlanguagesvalues.class);
q.setParameter("language_id", language_id);
return q.getResultList();
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldlanguagesvalues.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldlanguagesvalues.java?rev=1343134&r1=1343133&r2=1343134&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldlanguagesvalues.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldlanguagesvalues.java
Mon May 28 04:00:12 2012
@@ -25,13 +25,23 @@ import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
+import javax.persistence.JoinColumn;
import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
import javax.persistence.Table;
@Entity
+@NamedQueries({
+ @NamedQuery(name = "allFieldLanguageValues", query = "SELECT flv FROM
Fieldlanguagesvalues flv "
+ + "WHERE flv.deleted LIKE 'false' "
+ + " AND flv.fieldvalues.deleted LIKE 'false' "
+ + " AND flv.language_id = :language_id")})
@Table(name = "fieldlanguagesvalues")
public class Fieldlanguagesvalues implements Serializable {
@@ -53,6 +63,10 @@ public class Fieldlanguagesvalues implem
@Lob
@Column(name="value")
private String value;
+
+ @ManyToOne(fetch = FetchType.EAGER)
+ @JoinColumn(name = "fieldvalues_id")
+ private Fieldvalues fieldvalues;
public Fieldlanguagesvalues() {
super();
@@ -106,5 +120,13 @@ public class Fieldlanguagesvalues implem
public void setValue(String value) {
this.value = value;
}
+
+ public Fieldvalues getFieldvalues() {
+ return fieldvalues;
+ }
+
+ public void setFieldvalues(Fieldvalues fieldvalues) {
+ this.fieldvalues = fieldvalues;
+ }
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldvalues.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldvalues.java?rev=1343134&r1=1343133&r2=1343134&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldvalues.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldvalues.java
Mon May 28 04:00:12 2012
@@ -29,19 +29,11 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Transient;
@Entity
-@NamedQueries({
- @NamedQuery(name = "getFieldvaluesByLanguage", query = "SELECT
fv from Fieldvalues fv "
- + "LEFT JOIN fv.fieldlanguagesvalues flv "
- + "WHERE flv.deleted LIKE 'false' "
- + " AND fv.deleted LIKE 'false' "
- + " AND flv.language_id = :language_id")})
@Table(name = "fieldvalues")
public class Fieldvalues implements Serializable {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/LangExport.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/LangExport.java?rev=1343134&r1=1343133&r2=1343134&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/LangExport.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/LangExport.java
Mon May 28 04:00:12 2012
@@ -21,7 +21,6 @@ package org.openmeetings.servlet.outputh
import java.io.IOException;
import java.io.OutputStream;
import java.util.Date;
-import java.util.Iterator;
import java.util.List;
import javax.servlet.ServletException;
@@ -41,7 +40,6 @@ import org.openmeetings.app.data.basic.S
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.persistence.beans.lang.FieldLanguage;
import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
-import org.openmeetings.app.persistence.beans.lang.Fieldvalues;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -63,7 +61,7 @@ public class LangExport extends HttpServ
if (ScopeApplicationAdapter.initComplete) {
ApplicationContext context =
WebApplicationContextUtils
.getWebApplicationContext(getServletContext());
- return (Sessionmanagement)
context.getBean("sessionManagement");
+ return context.getBean("sessionManagement",
Sessionmanagement.class);
}
} catch (Exception err) {
log.error("[getSessionManagement]", err);
@@ -76,7 +74,7 @@ public class LangExport extends HttpServ
if (ScopeApplicationAdapter.initComplete) {
ApplicationContext context =
WebApplicationContextUtils
.getWebApplicationContext(getServletContext());
- return (Usermanagement)
context.getBean("userManagement");
+ return context.getBean("userManagement",
Usermanagement.class);
}
} catch (Exception err) {
log.error("[getUserManagement]", err);
@@ -89,7 +87,7 @@ public class LangExport extends HttpServ
if (ScopeApplicationAdapter.initComplete) {
ApplicationContext context =
WebApplicationContextUtils
.getWebApplicationContext(getServletContext());
- return (Fieldmanagment)
context.getBean("fieldmanagment");
+ return context.getBean("fieldmanagment",
Fieldmanagment.class);
}
} catch (Exception err) {
log.error("[getFieldmanagment]", err);
@@ -102,8 +100,7 @@ public class LangExport extends HttpServ
if (ScopeApplicationAdapter.initComplete) {
ApplicationContext context =
WebApplicationContextUtils
.getWebApplicationContext(getServletContext());
- return (FieldLanguageDaoImpl) context
-
.getBean("fieldLanguageDaoImpl");
+ return context.getBean("fieldLanguageDaoImpl",
FieldLanguageDaoImpl.class);
}
} catch (Exception err) {
log.error("[getFieldLanguageDaoImpl]", err);
@@ -155,11 +152,10 @@ public class LangExport extends HttpServ
FieldLanguage fl = getFieldLanguageDaoImpl()
.getFieldLanguageById(language_id);
- List<Fieldvalues> fvList = getFieldmanagment()
-
.getMixedFieldValuesList(language_id);
+ List<Fieldlanguagesvalues> flvList =
getFieldmanagment().getMixedFieldValuesList(language_id);
- if (fl != null && fvList != null) {
- Document doc =
this.createDocument(fvList);
+ if (fl != null && flvList != null) {
+ Document doc =
this.createDocument(flvList);
String requestedFile = fl.getName() +
".xml";
@@ -190,7 +186,7 @@ public class LangExport extends HttpServ
}
}
- public Document createDocument(List<Fieldvalues> fvList) throws
Exception {
+ public Document createDocument(List<Fieldlanguagesvalues> flvList)
throws Exception {
Document document = DocumentHelper.createDocument();
document.setXMLEncoding("UTF-8");
document.addComment("###############################################\n"
@@ -201,24 +197,12 @@ public class LangExport extends HttpServ
Element root = document.addElement("language");
- for (Iterator<Fieldvalues> it = fvList.iterator();
it.hasNext();) {
- Fieldvalues fv = it.next();
+ for (Fieldlanguagesvalues flv : flvList) {
Element eTemp = root.addElement("string")
- .addAttribute("id",
fv.getFieldvalues_id().toString())
- .addAttribute("name", fv.getName());
+ .addAttribute("id",
flv.getFieldvalues().getFieldvalues_id().toString())
+ .addAttribute("name",
flv.getFieldvalues().getName());
Element value = eTemp.addElement("value");
- if (fv.getFieldlanguagesvalue() != null) {
-
value.addText(fv.getFieldlanguagesvalue().getValue());
- } else {
- // Add english default text
- Fieldlanguagesvalues flv = getFieldmanagment()
-
.getFieldByIdAndLanguage(fv.getFieldvalues_id(), 1L);
- if (flv != null) {
- value.addText(flv.getValue());
- } else {
- value.addText("");
- }
- }
+ value.addText(flv.getValue());
}
return document;
