svn commit: r1391822 - /incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDaoImpl.java

[sebawagner]

Author: sebawagner
Date: Sat Sep 29 15:30:58 2012
New Revision: 1391822

URL: http://svn.apache.org/viewvc?rev=1391822&view=rev
Log:
Clean public List<Configuration> getConfigurations(int start, int max,
                        String orderby, boolean asc)

Modified:
    
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDaoImpl.java

Modified: 
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDaoImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDaoImpl.java?rev=1391822&r1=1391821&r2=1391822&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDaoImpl.java
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDaoImpl.java
 Sat Sep 29 15:30:58 2012
@@ -144,12 +144,12 @@ public class ConfigurationDaoImpl implem
        public List<Configuration> getConfigurations(int start, int max,
                        String orderby, boolean asc) {
                try {
-                       
+
                        String query = "SELECT c FROM Configuration c " //
                                        + "LEFT JOIN FETCH c.user " //
                                        + "WHERE c.deleted = false " //
-                                       + "ORDER BY "+ orderby;
-                       
+                                       + "ORDER BY " + orderby;
+
                        if (asc) {
                                query += " ASC";
                        } else {
@@ -160,25 +160,7 @@ public class ConfigurationDaoImpl implem
                                        Configuration.class);
                        q.setFirstResult(start);
                        q.setMaxResults(max);
-
-                       // CriteriaBuilder cb = em.getCriteriaBuilder();
-                       // CriteriaQuery<Configuration> cq = cb
-                       // .createQuery(Configuration.class);
-                       // Root<Configuration> c = cq.from(Configuration.class);
-                       // Predicate condition = cb.equal(c.get("deleted"), 
false);
-                       // cq.where(condition);
-                       // cq.distinct(asc);
-                       // if (asc) {
-                       // cq.orderBy(cb.asc(c.get(orderby)));
-                       // } else {
-                       // cq.orderBy(cb.desc(c.get(orderby)));
-                       // }
-                       // TypedQuery<Configuration> q = em.createQuery(cq);
-                       // q.setFirstResult(start);
-                       // q.setMaxResults(max);
-
-                       List<Configuration> ll = q.getResultList();
-                       return ll;
+                       return q.getResultList();
                } catch (Exception ex2) {
                        log.error("[getConfigurations]", ex2);
                }
@@ -226,8 +208,8 @@ public class ConfigurationDaoImpl implem
                return ret;
        }
 
-       public Long saveOrUpdateConfiguration(
-                       LinkedHashMap<String, ?> values, Long userId) {
+       public Long saveOrUpdateConfiguration(LinkedHashMap<String, ?> values,
+                       Long userId) {
                try {
                        Configuration conf = (Configuration) 
CastMapToObject.getInstance()
                                        .castByGivenObject(values, 
Configuration.class);