Changeset cba33281b3d5ab568bffa467af20463764a8f7c0

Timestamp:

03/01/08 16:09:23 (9 months ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

Christopher Jung <bktheg@web.de> 1204384163 +0100

git-parent:

[9e4bc5e766622e597afd6c642de28b7d86e7b04d]

git-author:

Christopher Jung <bktheg@web.de> 1204384163 +0100

Message:

consign und removeFromFleet nach ShipFleet? ausgelagert

Files:

• src/net/driftingsouls/ds2/server/modules/FleetMgntController.java (modified) (2 diffs)
• src/net/driftingsouls/ds2/server/ships/Ship.java (modified) (2 diffs)
• src/net/driftingsouls/ds2/server/ships/ShipFleet.java (modified) (3 diffs)

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

@@ -514 +514 @@
-                
-                if( newowner != null ) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                                Ship coords = (Ship)db.createQuery("from Ship where owner=? and fleet=?")
-                                        .setEntity(0, newowner)
@@ -546 +522 @@
-                                PM.send(user, newowner.getId(), "Flotte übergeben", "Ich habe dir die Flotte "+Common._plaintitle(this.fleet.getName())+" übergeben. Sie steht bei "+coords.getLocation());
-                
-message
+ShipFleet.MESSAGE.getMessage()
-                        }
-                        else {
-message
+ShipFleet.MESSAGE.getMessage()
-                        }
-                }

src/net/driftingsouls/ds2/server/ships/Ship.java

@@ -3038 +3038 @@
-         */
-        public void removeFromFleet() {
-                org.hibernate.Session db = ContextMap.getContext().getDB();
-
-                if( this.id < 0 ) {
-                        throw new UnsupportedOperationException("removeFromFleet kann nur bei Schiffen mit positiver ID ausgefuhert werden!");
@@ -3048 +3046 @@
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        }
-

src/net/driftingsouls/ds2/server/ships/ShipFleet.java

@@ -27 +27 @@
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.Transient;
-
-import net.driftingsouls.ds2.server.entities.User;
+import net.driftingsouls.ds2.server.framework.ContextLocalMessage;
-import net.driftingsouls.ds2.server.framework.ContextMap;
-
@@ -39 +41 @@
-@Table(name="ship_fleets")
-public class ShipFleet {
+        /**
+         * Objekt mit Funktionsmeldungen
+         */
+        public static final ContextLocalMessage MESSAGE = new ContextLocalMessage();
+        
-        @Id @GeneratedValue
-        private int id;
-        private String name;
+        
+        @Transient
+        private boolean consignMode = false;
-        
-        /**
@@ -283 +293 @@
-                }
-        }
+        
+        /**
+         * Uebergibt alle Schiffe der Flotte an den angegebenen Spieler. Meldungen
+         * werden dabei nach {@link #MESSAGE} geschrieben.
+         * @param newowner Der neue Besitzer.
+         * @return <code>true</code>, falls mindestens ein Schiff der Flotte uebergeben werden konnte
+         */
+        public boolean consign(User newowner) {
+                org.hibernate.Session db = ContextMap.getContext().getDB();
+                
+                int count = 0;
+                
+                this.consignMode = true;
+                try {
+                        List shiplist = db.createQuery("from Ship where fleet=? and battle is null" )
+                                .setInteger(0, this.id)
+                                .list();
+                        for( Iterator iter=shiplist.iterator(); iter.hasNext(); ) {
+                                Ship aship = (Ship)iter.next();
+                                boolean tmp = aship.consign(newowner, false );
+                        
+                                String msg = Ship.MESSAGE.getMessage();
+                                if( msg.length() > 0 ) {
+                                        MESSAGE.get().append(msg+"<br />");     
+                                }
+                                if( !tmp ) {
+                                        count++;
+                                        aship.setFleet(this);
+                                }
+                        }
+                }
+                finally {
+                        this.consignMode = false;
+                }
+                
+                return count > 0;
+        }
+        
+        /**
+         * Entfernt ein Schiff aus der Flotte. Slotte die Flotte anschliessend zu wenige Schiffe haben
+         * wird sie aufgeloesst.
+         * @param ship Das Schiff
+         */
+        public void removeShip(Ship ship) {
+                if( !this.equals(ship.getFleet()) ) {
+                        throw new IllegalArgumentException("Das Schiff gehoert nicht zu dieser Flotte");
+                }
+                
+                org.hibernate.Session db = ContextMap.getContext().getDB();
+                
+                int fleetcount = ((Number)db.createQuery("select count(*) from Ship where fleet=? and id>0")
+                                .setInteger(0, this.id)
+                                .iterate().next()).intValue();
+
+                if( fleetcount > 2 || this.consignMode ) {
+                        ship.setFleet(null);
+                        MESSAGE.get().append("aus der Flotte ausgetreten");
+                } 
+                else {
+                        final Iterator shipIter = db.createQuery("from Ship where fleet=?")
+                                .setEntity(0, this)
+                                .iterate();
+                        while( shipIter.hasNext() ) {
+                                Ship aship = (Ship)shipIter.next();
+                                aship.setFleet(null);
+                        }
+                        
+                        db.delete(this);
+                        MESSAGE.get().append("Flotte aufgel&ouml;&szlig;t");
+                }
+        }
-}