svn commit: r1345509 - in /incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user: Usermanagement.java dao/PrivateMessagesDaoImpl.java

[sebawagner]

Author: sebawagner
Date: Sat Jun  2 14:04:28 2012
New Revision: 1345509

URL: http://svn.apache.org/viewvc?rev=1345509&view=rev
Log:
OPENMEETINGS-302 Delete massges in Trash 

Modified:
    
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
    
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/PrivateMessagesDaoImpl.java

Modified: 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java?rev=1345509&r1=1345508&r2=1345509&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
 Sat Jun  2 14:04:28 2012
@@ -652,7 +652,7 @@ public class Usermanagement {
                        String DATA, String Comment) {
                String res = "Fehler beim Update";
                try {
-                       String hqlUpdate = "update Userdata set data = :data, 
updatetime = :updatetime, "
+                       String hqlUpdate = "UPDATE Userdata set data = :data, 
updatetime = :updatetime, "
                                        + "comment = :comment where user_id= 
:user_id AND data_key = :data_key";
                        int updatedEntities = em.createQuery(hqlUpdate)
                                        .setParameter("data", DATA)
@@ -667,33 +667,6 @@ public class Usermanagement {
                return res;
        }
 
-       public String deleteUserdata(int DATA_ID) {
-               String res = "Fehler beim deleteUserdata";
-               try {
-                       String hqlUpdate = "delete userdata where DATA_ID= 
:DATA_ID";
-                       int updatedEntities = em.createQuery(hqlUpdate)
-                                       .setParameter("DATA_ID", 
DATA_ID).executeUpdate();
-                       res = "Success" + updatedEntities;
-               } catch (Exception ex2) {
-                       log.error("deleteUserdata", ex2);
-               }
-               return res;
-       }
-
-       public String deleteUserdataByUserAndKey(int users_id, String DATA_KEY) 
{
-               String res = "Fehler beim deleteUserdataByUserAndKey";
-               try {
-                       String hqlUpdate = "delete userdata where users_id= 
:users_id AND DATA_KEY = :DATA_KEY";
-                       int updatedEntities = em.createQuery(hqlUpdate)
-                                       .setParameter("users_id", users_id)
-                                       .setParameter("DATA_KEY", 
DATA_KEY).executeUpdate();
-                       res = "Success" + updatedEntities;
-               } catch (Exception ex2) {
-                       log.error("deleteUserdataByUserAndKey", ex2);
-               }
-               return res;
-       }
-
        public String addUserdata(long USER_ID, String DATA_KEY, String DATA,
                        String Comment) {
                String ret = "Fehler beim speichern der Userdata";

Modified: 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/PrivateMessagesDaoImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/PrivateMessagesDaoImpl.java?rev=1345509&r1=1345508&r2=1345509&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/PrivateMessagesDaoImpl.java
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/PrivateMessagesDaoImpl.java
 Sat Jun  2 14:04:28 2012
@@ -600,7 +600,7 @@ public class PrivateMessagesDaoImpl {
        public int deletePrivateMessages(List<Long> privateMessageIds) {
                try {
                        
-                       String hql = "DELETE PrivateMessages c " +
+                       String hql = "DELETE FROM PrivateMessages c " +
                                                "where c.privateMessageId IN 
(:privateMessageIds) ";
                        
                        Query query = em.createQuery(hql);