Changeset fdd9b7da5f3efa70d6ba2e2ede6d0cb28403831c

Timestamp:

07/01/07 09:50:24 (1 year ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

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

git-parent:

[4a172a397d76d3496affe3466ffca8e2a53daaa5]

git-author:

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

Message:

Weitere Anpassungen an Hibernate

Files:

• src/net/driftingsouls/ds2/server/werften/ShipWerft.java (modified) (1 diff)
• src/net/driftingsouls/ds2/server/werften/WerftGUI.java (modified) (16 diffs)
• src/net/driftingsouls/ds2/server/werften/WerftObject.java (modified) (6 diffs)

src/net/driftingsouls/ds2/server/werften/ShipWerft.java

@@ -390 +390 @@
-        
-        @Override
-int dismantle
-dismantle
+Ship ship
+ship
-                
-                this.ship.recalculateShipStatus();

src/net/driftingsouls/ds2/server/werften/WerftGUI.java

@@ -21 +21 @@
-import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
@@ -26 +27 @@
-import net.driftingsouls.ds2.server.Location;
-import net.driftingsouls.ds2.server.Offizier;
+import net.driftingsouls.ds2.server.bases.Base;
-import net.driftingsouls.ds2.server.cargo.Cargo;
-import net.driftingsouls.ds2.server.cargo.ItemCargoEntry;
@@ -43 +45 @@
-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.framework.templates.TemplateEngine;
@@ -78 +78 @@
-         */
-        public String execute( WerftObject werft ) {
-Database db = context.getDatabase
+org.hibernate.Session db = context.getDB
-        
-                int build = context.getRequest().getParameterInt("build");
@@ -142 +142 @@
-                                        t.parse("werftgui.linkedbase.list", "werftgui.linkedbase.listitem", true);
-                
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                                t.parse("werftgui.linkedbase.list", "werftgui.linkedbase.listitem", true);
-                                        }
-                                        base.free();
-                                }
-                        }
@@ -159 +165 @@
-
-        private void out_wsShipList(WerftObject werft) {
-Database db = context.getDatabase
+org.hibernate.Session db = context.getDB
-
-                t.set_var("werftgui.wsshiplist", 1);
-                t.set_block("_WERFT.WERFTGUI", "wsshiplist.listitem", "wsshiplist.list");
-                
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                continue;       
-                        }
-                        
-Ship.getShipType( ship.getRow() 
-
-Int("hull") < shiptype.getHull()) || (ship.getInt("engine"
-Int("sensors") < 100) || (ship.getInt("comm") < 100) || (ship.getInt("weapons"
+ship.getTypeData(
+
+Hull() < shiptype.getHull()) || (ship.getEngine(
+Sensors() < 100) || (ship.getComm() < 100) || (ship.getWeapons(
-                                t.set_var("ship.needsrepair", 1);
-                        }
@@ -183 +197 @@
-                        }
-                        
-
-
-
-
+
-                                                
-nt("id"
-String("name"
+d(
+Name(
-                                                "ship.owner.name",      ownername );
-                                                                
-                        t.parse("wsshiplist.list", "wsshiplist.listitem", true);
-                }
-                ship.free();
-        }
-
@@ -318 +328 @@
-        private void out_ws(WerftObject werft, int ws) {
-                Context context = ContextMap.getContext();
-Database db = context.getDatabase
+org.hibernate.Session db = context.getDB
-
-                User user = (User)context.getActiveUser();
-                String sess = context.getSession();
-                
-QLResultRow ship = db.first("SELECT * FROM ships WHERE id>0 AND id=",
-ship.isEmpty(
+hip ship = (Ship)db.get(Ship.class, 
+(ship == null) || (ship.getId() < 0
-                        context.addError("Das angegebene Schiff existiert nicht", werft.getUrlBase()+"&amp;sess="+sess);                
-                        return;
@@ -332 +342 @@
-                        return;
-                }
-Location.fromResult(ship
+ship.getLocation(
-                        context.addError("Das Schiff befindet sich nicht im selben Sektor wie die Werft", werft.getUrlBase()+"&amp;sess="+sess);                
-                        return;
-                }
-                
-Int("battle"
+Battle(
-                        context.addError("Das Schiff befindet sich in einer Schlacht", werft.getUrlBase()+"&amp;sess="+sess);                   
-                        return;
-                }
-                
-Ship.getShipType(ship
+ship.getTypeData(
-                
-                t.set_var(      "werftgui.ws",                  1,
-nt("id"
-String("name"
-Int("owner") == user.getID()
-Int("owner"
+d(
+Name(
+Owner() == user
+Owner(
-                                        "ship.type.modules",    shipType.getTypeModules() );
-        
-Int("owner") != user.getID()
-(User)context.getDB().get(User.class, ship.getInt("owner")
+Owner() != user
+ship.getOwner(
-                        t.set_var("ship.owner.name", Common._title(owner.getName()));
-                }
@@ -360 +370 @@
-                        String conf = context.getRequest().getParameterString("conf");
-                        
-.getInt("id")
+
-                }
-                else if( action.equals("dismantle") ) {
-                        String conf = context.getRequest().getParameterString("conf");
-                        
-.getInt("id")
+
-                }
-                else if( action.equals("module") ) {
-.getInt("id")
+
-                }
-                else {
@@ -391 +401 @@
-        }
-
-QLResultRow
-Ship.getShipType(ship
+hip
+ship.getTypeData(
-                
-                t.set_var(      "werftgui.ws.showinfo",         1,
-String("name"
+Name(
-                                        "ship.type.id",                         shipType.getTypeId(),
-                                        "ship.type.picture",            shipType.getPicture(),
-nt("id"
-Int("hull"
+d(
+Hull(
-                                        "ship.type.hull",                       shipType.getHull(),
-Int("hull"
-Int("hull"
-Int("shields"
+Hull(
+Hull(
+Shields(
-                                        "ship.type.shields",            shipType.getShields(),
-Int("shields"
-Int("engine"
+Shields(
+Engine(
-                                        "ship.type.engine",                     ( shipType.getCost() > 0 ? 100 : 0 ),
-Int("engine"
-Int("engine"
+Engine(
+Weapons(
-                                        "ship.type.weapons",            ( shipType.isMilitary() ? 100 : 0 ),
-Int("weapons"
-Int("comm"
+Weapons(
+Comm(
-                                        "ship.type.comm",                       100,
-Int("comm"
-Int("sensors"
+Comm(
+Sensors(
-                                        "ship.type.sensors",            100,
-Int("sensors"
-Int("crew"
+Sensors(
+Crew(
-                                        "ship.type.crew",                       shipType.getCrew(),
-Int("crew"
-Int("e"
+Crew(
+Energy(
-                                        "ship.type.e",                          shipType.getEps(),
-Int("e"
-Int("s"
-
-nt("id"
+Energy(
+Heat(
+
+d(
-                if( offizier != null ) {
-                        t.set_var(      "ship.offizier.id",                     offizier.getID(),
@@ -435 +445 @@
-        }
-
-int shipID
+Ship ship
-                Context context = ContextMap.getContext();
-                org.hibernate.Session db = context.getDB();
-                String sess = context.getSession();
-                User user = (User)context.getActiveUser();
@@ -444 +453 @@
-                int slot = context.getRequest().getParameterInt("slot");
-                String moduleaction = context.getRequest().getParameterString("moduleaction");
-        
-                Ship ship = (Ship)db.get(Ship.class, shipID);
-        
-                //Gehoert das Schiff dem User?
@@ -527 +534 @@
-        }
-
-int dismantle
+Ship ship
-                Context context = ContextMap.getContext();
-                org.hibernate.Session db = context.getDB();
-                String sess = context.getSession();
-                User user = (User)context.getActiveUser();
-                
-                Ship ship = (Ship)db.get(Ship.class, dismantle);
-                
-                //Gehoert das Schiff dem User?
@@ -570 +574 @@
-                }
-
-dismantle
+ship
-                if( !ok ) {
-                        t.set_var("ws.dismantle.error", werft.MESSAGE.getMessage() );
@@ -582 +586 @@
-        }
-
-int repair
+Ship ship
-                Context context = ContextMap.getContext();
-
-
-
+
-                if( (ship == null) || (ship.getId() < 0) ) {
-                        context.addError("Das angegebene Schiff existiert nicht oder geh&ouml;rt nicht ihnen");

src/net/driftingsouls/ds2/server/werften/WerftObject.java

@@ -830 +830 @@
-         * nur das demontieren selbst.{@link DSObject#MESSAGE} enthaelt die Hinweistexte
-         * 
-dismantle Die ID des zu demontierenden Schiffes
+ship Das zu demontierende Schiff
-         * @param testonly Soll nur geprueft (true) oder wirklich demontiert werden (false)?
-         * @return true, wenn kein Fehler aufgetreten ist
-         */
-int dismantle
+Ship ship
-                org.hibernate.Session db = ContextMap.getContext().getDB();
-                
-                StringBuilder output = MESSAGE.get();
-        
-
-
+
-                        ContextMap.getContext().addError("Das angegebene Schiff existiert nicht");
-                        return false;
-                }
-                
-d
+hip
-                
-                Cargo cargo = this.getCargo(false);
@@ -851 +850 @@
-                long maxcargo = this.getMaxCargo(false);
-        
-d
+hip
-                
-                Cargo newcargo = (Cargo)cargo.clone();
@@ -866 +865 @@
-                }
-        
-d
+hip
-                        output.append("Nicht gengend Platz für die Crew\n");
-                        ok = false;
@@ -874 +873 @@
-                
-                List offiziere = db.createQuery("from Offizier where dest=?")
-dismantle
+ship.getId()
-                        .list();
-                
@@ -888 +887 @@
-                        this.setCargo(newcargo, false);
-        
-d
+hip
-                        for( Iterator iter=offiziere.iterator(); iter.hasNext(); ) {
-                                Offizier offi = (Offizier)iter.next();
@@ -894 +893 @@
-                        }
-        
-d
+hip
-                }
-