Changeset 310a7647e8d85d3bb174808912919400dcb95570

Timestamp:

08/26/07 11:13:46 (1 year ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

Christopher Jung <bktheg@web.de> 1188119626 +0200

git-parent:

[83b75a066026185e29fcf147e4b81bfc393fd03f]

git-author:

Christopher Jung <bktheg@web.de> 1188119626 +0200

Message:

Entity fuer transmissionen hinzugefuegt und an einigen Stellen verwendet

Files:

• src/net/driftingsouls/ds2/server/comm/Ordner.java (modified) (6 diffs)
• src/net/driftingsouls/ds2/server/comm/PM.java (modified) (10 diffs)
• src/net/driftingsouls/ds2/server/modules/CommController.java (modified) (4 diffs)
• web/WEB-INF/cfg/hibernatemappings.xml (modified) (1 diff)

src/net/driftingsouls/ds2/server/comm/Ordner.java

@@ -37 +37 @@
-import net.driftingsouls.ds2.server.framework.Context;
-import net.driftingsouls.ds2.server.framework.ContextMap;
-import net.driftingsouls.ds2.server.framework.db.Database;
-import net.driftingsouls.ds2.server.framework.db.SQLQuery;
-
-/**
@@ -233 +231 @@
-         */
-        public int countPMInOrdner() {
-Database db = ContextMap.getContext().getDatabase
+org.hibernate.Session db = ContextMap.getContext().getDB
-
-                int gelesen = 2;
@@ -240 +238 @@
-                }
-                
-
+
+
+
+
+
-        }
-        
@@ -251 +253 @@
-         */
-        public Map<Integer,Integer> countPMInAllOrdner() { 
-Database db = ContextMap.getContext().getDatabase
+org.hibernate.Session db = ContextMap.getContext().getDB
-                Map<Integer,Integer> result = new HashMap<Integer,Integer>();
-                
@@ -273 +275 @@
-                int trash = getTrash( this.owner ).getID();
-                
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                }
-
@@ -336 +339 @@
-         */
-        public void setName( String name ) {
-                Database db = ContextMap.getContext().getDatabase();
-                db.prepare("UPDATE ordner SET name= ? WHERE id= ?").update(name, this.id);
-                this.name = name;
-        }

src/net/driftingsouls/ds2/server/comm/PM.java

@@ -22 +22 @@
-import java.util.List;
-
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
-import net.driftingsouls.ds2.server.entities.Ally;
-import net.driftingsouls.ds2.server.entities.User;
@@ -28 +36 @@
-import net.driftingsouls.ds2.server.framework.Context;
-import net.driftingsouls.ds2.server.framework.ContextMap;
-import net.driftingsouls.ds2.server.framework.db.Database;
-import net.driftingsouls.ds2.server.framework.db.SQLQuery;
-import net.driftingsouls.ds2.server.framework.db.SQLResultRow;
-import net.driftingsouls.ds2.server.tasks.Taskmanager;
-
-/**
-
+
+
+
+
+
+
+
+
+
- * @author Christopher Jung
- * @author Christian Peltz
- *
- */
+@Entity
+@Table(name="transmissionen")
-public class PM {
-        /**
@@ -98 +113 @@
-        public static void sendToAlly( User from, Ally to, String title, String txt, int flags ) {
-                Context context = ContextMap.getContext();
-Database db = context.getDatabase
+org.hibernate.Session db = context.getDB
-
-                String msg = "an Allianz "+to.getName()+"\n"+txt;
@@ -106 +121 @@
-                }
-                
-context.getDB()
+db
-                        .setEntity(0, to)
-                        .list();
@@ -112 +127 @@
-                        User member = (User)iter.next();
-                        
-db.prepare("INSERT INTO transmissionen (sender,empfaenger,inhalt,time,title,flags,kommentar) " +
-               "VALUES (?,?,?,?,?,?,?)")
-       .update(from.getID(), member.getID(), msg, Common.time(), title, flags, ""
+PM pm = new PM(from, member, title, msg);
+pm.setFlags(flags);
+db.persist(pm
-                }
-        }
@@ -128 +143 @@
-        public static void send( User from, int to, String title, String txt, int flags ) {
-                Context context = ContextMap.getContext();
-Database db = context.getDatabase
+org.hibernate.Session db = context.getDB
-
-                /*
@@ -139 +154 @@
-                        }
-                
-context.getDB()
+db
-                        if( user != null ) {
-db.prepare("INSERT INTO transmissionen (sender,empfaenger,inhalt,time,title,flags,kommentar) " +
-               "VALUES (?,?,?,?,?,?,?)")
-       .update(from.getID(), to, txt, Common.time(), title, flags, ""
-
+PM pm = new PM(from, user, title, txt);
+pm.setFlags(flags);
+db.persist(pm
+                               
-                                String forward = user.getUserValue("TBLORDER/pms/forward");
-                                if( !"".equals(forward) && (Integer.parseInt(forward) != 0) ) {
@@ -197 +212 @@
-         */
-        public static int deleteAllInOrdner( Ordner ordner, User user ) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-                        }
-
-
-
-
-
+
+
-                return 0;       //geloescht
-        }
@@ -247 +239 @@
-         */
-        public static void moveAllToOrdner( Ordner source, Ordner dest , User user) {
-Database db = ContextMap.getContext().getDatabase
+org.hibernate.Session db = ContextMap.getContext().getDB
-                Ordner trash = Ordner.getTrash( user );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -276 +260 @@
-         */
-        public static void recoverAll( User user ) {
-Database db = ContextMap.getContext().getDatabase
+org.hibernate.Session db = ContextMap.getContext().getDB
-                int trash = Ordner.getTrash( user ).getID();
-        
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-}

src/net/driftingsouls/ds2/server/modules/CommController.java

@@ -123 +123 @@
-         */
-        public void deleteAction() {
+                org.hibernate.Session db = getDB();
-                User user = (User)getUser();
-                TemplateEngine t = getTemplateEngine();
@@ -134 +135 @@
-                if( (ordner != null) && (delete == 0) ) {
-                        result = ordner.deleteOrdner();
-
-
+
+
+
+
+
+
-                }
-
@@ -502 +507 @@
-
-                        if( pm_id == pms.get(i) ) {
-
+
+
+
+
+
-                        }
-                }
@@ -712 +721 @@
-
-                parameterNumber("recover");
-
-
-
+
+
+
+
+
-                
-                redirect("showInbox");

web/WEB-INF/cfg/hibernatemappings.xml

@@ -82 +82 @@
-        <mapping class="net.driftingsouls.ds2.server.tasks.Task" />
-        <mapping class="net.driftingsouls.ds2.server.entities.ResourceLimit" /> 
-!-- transmissionen [net.driftingsouls.ds2.server.comm.PM umbauen] -->
+mapping class="net.driftingsouls.ds2.server.comm.PM" /> 
-        <mapping class="net.driftingsouls.ds2.server.entities.User" />
-        <!-- user_f -->