You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/09/30 09:58:26 UTC
svn commit: r1391962 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/WEB-INF/ src/org/apache/openmeetings/data/basic/
src/org/apache/openmeetings/web/components/admin/labels/
Author: sebawagner
Date: Sun Sep 30 07:58:25 2012
New Revision: 1391962
URL: http://svn.apache.org/viewvc?rev=1391962&view=rev
Log:
Rename/Refactor FieldLanguageValuesDAO to FieldLanguageValuesDaoImpl
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDaoImpl.java
- copied, changed from r1391821, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDAO.java
Removed:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDAO.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Fieldmanagment.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LabelsForm.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1391962&r1=1391961&r2=1391962&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml Sun Sep 30 07:58:25 2012
@@ -188,7 +188,7 @@
<bean id="omTimeZoneDaoImpl" class="org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl" />
<bean id="statemanagement" class="org.apache.openmeetings.data.user.Statemanagement" />
<bean id="fieldLanguageDaoImpl" class="org.apache.openmeetings.data.basic.FieldLanguageDaoImpl" />
- <bean id="fieldLanguagesValuesDAO" class="org.apache.openmeetings.data.basic.FieldLanguagesValuesDAO" />
+ <bean id="fieldLanguagesValuesDAO" class="org.apache.openmeetings.data.basic.FieldLanguagesValuesDaoImpl" />
<bean id="fieldmanagment" class="org.apache.openmeetings.data.basic.Fieldmanagment" />
<bean id="configurationDaoImpl" class="org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl" />
<bean id="appointmentDao"
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDaoImpl.java (from r1391821, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDAO.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDaoImpl.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDaoImpl.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDAO.java&r1=1391821&r2=1391962&rev=1391962&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDAO.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDaoImpl.java Sun Sep 30 07:58:25 2012
@@ -32,43 +32,83 @@ import org.apache.openmeetings.persisten
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
+/**
+ *
+ * CRUD operations for {@link Fieldlanguagesvalues}
+ *
+ * @author solomax, swagner
+ *
+ */
@Transactional
-public class FieldLanguagesValuesDAO implements OmDAO<Fieldlanguagesvalues> {
+public class FieldLanguagesValuesDaoImpl implements OmDAO<Fieldlanguagesvalues> {
@PersistenceContext
private EntityManager em;
@Autowired
private ConfigurationDaoImpl configurationDaoImpl;
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.openmeetings.data.OmDAO#get(int, int)
+ */
public List<Fieldlanguagesvalues> get(int first, int count) {
- return get(configurationDaoImpl.getConfValue("default_lang_id", Long.class, "1"), first, count);
+ return get(configurationDaoImpl.getConfValue("default_lang_id",
+ Long.class, "1"), first, count);
}
-
+
+ /**
+ * Advanced query to set the language id
+ *
+ * @param language_id
+ * @param first
+ * @param count
+ * @return
+ */
public List<Fieldlanguagesvalues> get(Long language_id, int first, int count) {
// all Fieldlanguagesvalues in current Language
- TypedQuery<Fieldlanguagesvalues> q = em.createNamedQuery("allFieldLanguageValues", Fieldlanguagesvalues.class);
+ TypedQuery<Fieldlanguagesvalues> q = em.createNamedQuery(
+ "allFieldLanguageValues", Fieldlanguagesvalues.class);
q.setParameter("language_id", language_id);
q.setFirstResult(first);
q.setMaxResults(count);
return q.getResultList();
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.openmeetings.data.OmDAO#get(long)
+ */
public Fieldlanguagesvalues get(long id) {
- TypedQuery<Fieldlanguagesvalues> q = em.createNamedQuery("getFieldLanguagesValuesById", Fieldlanguagesvalues.class);
+ TypedQuery<Fieldlanguagesvalues> q = em.createNamedQuery(
+ "getFieldLanguagesValuesById", Fieldlanguagesvalues.class);
q.setParameter("id", id);
Fieldlanguagesvalues flv = null;
try {
flv = q.getSingleResult();
} catch (NoResultException e) {
-
+
}
return flv;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.openmeetings.data.OmDAO#count()
+ */
public long count() {
TypedQuery<Long> q = em.createNamedQuery("getFieldCount", Long.class);
return q.getSingleResult();
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.openmeetings.data.OmDAO#update(org.apache.openmeetings.persistence
+ * .beans.OmEntity, long)
+ */
public void update(Fieldlanguagesvalues entity, long userId) {
entity.setUpdatetime(new Date());
if (entity.getFieldlanguagesvalues_id() == null) {
@@ -78,6 +118,13 @@ public class FieldLanguagesValuesDAO imp
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.openmeetings.data.OmDAO#delete(org.apache.openmeetings.persistence
+ * .beans.OmEntity, long)
+ */
public void delete(Fieldlanguagesvalues entity, long userId) {
entity.setDeleted(true);
entity.setUpdatetime(new Date());
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Fieldmanagment.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Fieldmanagment.java?rev=1391962&r1=1391961&r2=1391962&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Fieldmanagment.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Fieldmanagment.java Sun Sep 30 07:58:25 2012
@@ -60,7 +60,7 @@ public class Fieldmanagment {
private FieldLanguageDaoImpl fieldLanguageDaoImpl;
@Autowired
- private FieldLanguagesValuesDAO fieldLanguagesValuesDAO;
+ private FieldLanguagesValuesDaoImpl fieldLanguagesValuesDAO;
@Autowired
private ConfigurationDaoImpl configurationDaoImpl;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LabelsForm.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LabelsForm.java?rev=1391962&r1=1391961&r2=1391962&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LabelsForm.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LabelsForm.java Sun Sep 30 07:58:25 2012
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.components.admin.labels;
-import org.apache.openmeetings.data.basic.FieldLanguagesValuesDAO;
+import org.apache.openmeetings.data.basic.FieldLanguagesValuesDaoImpl;
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
@@ -57,7 +57,7 @@ public class LabelsForm extends AdminBas
protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
Fieldlanguagesvalues flv = getModelObject();
if (flv.getFieldlanguagesvalues_id() != null) {
- flv = Application.getBean(FieldLanguagesValuesDAO.class).get(
+ flv = Application.getBean(FieldLanguagesValuesDaoImpl.class).get(
getModelObject().getFieldlanguagesvalues_id());
} else {
flv = new Fieldlanguagesvalues();
@@ -68,7 +68,7 @@ public class LabelsForm extends AdminBas
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
- Application.getBean(FieldLanguagesValuesDAO.class).update(
+ Application.getBean(FieldLanguagesValuesDaoImpl.class).update(
getModelObject(), WebSession.getUserId());
// FIXME reload
}
@@ -76,7 +76,7 @@ public class LabelsForm extends AdminBas
// FIXME confirmation
@Override
protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) {
- Application.getBean(FieldLanguagesValuesDAO.class).delete(
+ Application.getBean(FieldLanguagesValuesDaoImpl.class).delete(
getModelObject(), WebSession.getUserId());
// FIXME reload
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java?rev=1391962&r1=1391961&r2=1391962&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java Sun Sep 30 07:58:25 2012
@@ -21,7 +21,7 @@ package org.apache.openmeetings.web.comp
import java.util.Iterator;
import org.apache.openmeetings.data.basic.FieldLanguageDaoImpl;
-import org.apache.openmeetings.data.basic.FieldLanguagesValuesDAO;
+import org.apache.openmeetings.data.basic.FieldLanguagesValuesDaoImpl;
import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
import org.apache.openmeetings.web.app.Application;
@@ -61,13 +61,13 @@ public class LangPanel extends AdminPane
final DataView<Fieldlanguagesvalues> dataView = new DataView<Fieldlanguagesvalues>(
"langList", new OmDataProvider<Fieldlanguagesvalues>(
- FieldLanguagesValuesDAO.class) {
+ FieldLanguagesValuesDaoImpl.class) {
private static final long serialVersionUID = -6822789354860988626L;
public Iterator<? extends Fieldlanguagesvalues> iterator(
long first, long count) {
return Application
- .getBean(FieldLanguagesValuesDAO.class)
+ .getBean(FieldLanguagesValuesDaoImpl.class)
.get(language.getLanguage_id(), (int) first,
(int) count).iterator();
}