Changeset 9689aa540670735b543f787fb9212540cbddf8cc

Timestamp:

08/11/07 15:54:30 (1 year ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

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

git-parent:

[205b19be0ccc9c67b8505fb8b95cd4e0bcae761d]

git-author:

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

Message:

Werftkomplexe eingebaut

Files:

• db/tables/werften.sql (modified) (2 diffs)
• db/updates.xml (modified) (1 diff)
• src/net/driftingsouls/ds2/server/modules/KapernController.java (modified) (3 diffs)
• src/net/driftingsouls/ds2/server/modules/ks/KSKapernAction.java (modified) (3 diffs)
• src/net/driftingsouls/ds2/server/ships/Ship.java (modified) (8 diffs)
• src/net/driftingsouls/ds2/server/werften/BaseWerft.java (modified) (2 diffs)
• src/net/driftingsouls/ds2/server/werften/ShipWerft.java (modified) (3 diffs)
• src/net/driftingsouls/ds2/server/werften/WerftGUI.java (modified) (4 diffs)
• src/net/driftingsouls/ds2/server/werften/WerftKomplex.java (added)
• src/net/driftingsouls/ds2/server/werften/WerftObject.java (modified) (7 diffs)
• src/net/driftingsouls/ds2/server/werften/WerftQueueEntry.java (modified) (1 diff)
• templates/werft.werftgui.html (modified) (3 diffs)
• web/WEB-INF/cfg/hibernatemappings.xml (modified) (1 diff)

db/tables/werften.sql

@@ -6 +6 @@
-  `shipid` int(11) default null,
-  `linked` int(11) default null,
+  `linkedWerft` int(11) default null,
+  `komplex` tinyint(1) NOT NULL default '0', 
-  PRIMARY KEY  (`id`),
-  KEY `col` (`col`),
@@ -14 +16 @@
-ALTER TABLE werften ADD CONSTRAINT werften_fk_bases2 FOREIGN KEY (col) REFERENCES bases(id);
-ALTER TABLE werften ADD CONSTRAINT werften_fk_ships FOREIGN KEY (shipid) REFERENCES ships(id);
+ALTER TABLE werften ADD CONSTRAINT werften_fk_werften FOREIGN KEY (linkedWerft) REFERENCES werften(id) ON DELETE SET NULL;

db/updates.xml

@@ -372 +372 @@
-                ALTER TABLE `fz` DROP INDEX `col`;
-        ]]></update>
+        <update type="structure" datum="2007-08-05"><![CDATA[
+                ALTER TABLE `werften` ADD `linkedWerft` INT NULL;
+                ALTER TABLE werften ADD CONSTRAINT werften_fk_werften FOREIGN KEY (linkedWerft) REFERENCES werften(id) ON DELETE SET NULL;
+                ALTER TABLE `werften` ADD `komplex` TINYINT( 1 ) NOT NULL DEFAULT '0';
+        ]]></update>
-</updates>

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

@@ -42 +42 @@
-import net.driftingsouls.ds2.server.ships.ShipTypeData;
-import net.driftingsouls.ds2.server.ships.ShipTypes;
+import net.driftingsouls.ds2.server.werften.ShipWerft;
-
-import org.apache.commons.lang.math.RandomUtils;
@@ -418 +419 @@
-                        
-                        if( this.targetShipType.getWerft() != 0 ) {
-
+
+
+
+
+
+
+
+
-                        }
-                        
@@ -439 +447 @@
-                                        .executeUpdate();
-                                
-
+
+
+
+
+
+
+
+
+
+
-                        }
-                        

src/net/driftingsouls/ds2/server/modules/ks/KSKapernAction.java

@@ -40 +40 @@
-import net.driftingsouls.ds2.server.ships.ShipTypeData;
-import net.driftingsouls.ds2.server.ships.ShipTypes;
+import net.driftingsouls.ds2.server.werften.ShipWerft;
-
-/**
@@ -286 +287 @@
-                                        .executeUpdate();
-                                if( dockShip.getTypeData().getWerft() != 0 ) {
-db.createQuery("update ShipWerft set linked=null where shipid
+ShipWerft werft = (ShipWerft)db.createQuery("from ShipWerft where ship
-                                                .setEntity(0, dockShip)
-
+
+
+
+
+
+
-                                }
-                                
@@ -299 +305 @@
-                                .executeUpdate();
-                        if( enemyShipType.getWerft() != 0 ) {
-db.createQuery("update ShipWerft set linked=null where shipid
+ShipWerft werft = (ShipWerft)db.createQuery("from ShipWerft where ship
-                                        .setEntity(0, enemyShip)
-
+
+
+
+
+
+
-                        }
-                                

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

@@ -889 +889 @@
-
-                this.status = Common.implode(" ", status);
+                
+                // Ueberpruefen, ob ein evt vorhandener Werftkomplex nicht exisitert
+                if( type.getWerft() != 0 ) {
+                        ShipWerft werft = (ShipWerft)db.createQuery("from ShipWerft where ship=?")
+                                .setEntity(0, this)
+                                .uniqueResult();
+                        
+                        if( werft.getKomplex() != null ) {
+                                werft.getKomplex().checkWerftLocations();
+                        }
+                }
-
-                return this.status;
@@ -1792 +1803 @@
-                        for( Ship fleetship : fleetdata.ships.values() ) {
-                                if( fleetdata.dockedCount.get(fleetship.getId()) > 0 ) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                                }
-
@@ -2150 +2165 @@
-                        this.docked = "";
-                        if( docked != 0 ) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                        }
-                }
@@ -2426 +2445 @@
-                                aship.setY(outLoc.getY());
-                                aship.setSystem(outLoc.getSystem());
+                                aship.recalculateShipStatus();
-                        }
-
@@ -2867 +2887 @@
-                // Und nun loeschen wir es...
-                db.createQuery("delete from Offizier where dest=?")
-
-
+       
+       
-
-                db.createQuery("delete from Jump where shipid=?")
-
-
+       
+       
-
-                ShipWerft werft = (ShipWerft)db.createQuery("from ShipWerft where shipid=?")
-
-
+       
+       
-
-                if( werft != null ) {
+                        if( werft.getKomplex() != null ) {
+                                werft.removeFromKomplex();
+                        }
-                        werft.clearQueue();
-                        db.delete(werft);
@@ -2884 +2907 @@
-
-                db.createQuery("delete from ShipModules where id=?")
-
-
+       
+       
-
-                db.delete(this);
@@ -2947 +2970 @@
-                        this.owner = newowner;
-                        db.createQuery("update Offizier set userid=? where dest=?")
-
-
-
+       
+       
+       
-
-                        Common.dblog( "consign", Integer.toString(this.id), Integer.toString(newowner.getID()), 
@@ -2960 +2983 @@
-                                newowner.setFlagschiff(this.id);
-                        }
+                        
+                        if( getTypeData().getWerft() != 0 ) {
+                                ShipWerft werft = (ShipWerft)db.createQuery("from ShipWerft where ship=?")
+                                        .setEntity(0, this)
+                                        .uniqueResult();
+                                
+                                if( werft.getKomplex() != null ) {
+                                        werft.removeFromKomplex();
+                                }
+                        }
-                }
-
-                StringBuilder message = MESSAGE.get();
-                List s = db.createQuery("from Ship where id>0 and docked in (?,?)")
-
-
-
+       
+       
+       
-                for( Iterator iter=s.iterator(); iter.hasNext(); ) {
-                        Ship aship = (Ship)iter.next();

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

@@ -32 +32 @@
-import net.driftingsouls.ds2.server.cargo.Cargo;
-import net.driftingsouls.ds2.server.entities.User;
+import net.driftingsouls.ds2.server.framework.Common;
-import net.driftingsouls.ds2.server.framework.ContextMap;
-
@@ -219 +220 @@
-                return base.getName();
-        }
+
+        @Override
+        public boolean isLinkableWerft() {
+                return false;
+        }
+
+        @Override
+        public String getObjectUrl() {
+                return Common.buildUrl(ContextMap.getContext(), "default", "module", "base", "col", base.getID());
+        }
-}

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

@@ -32 +32 @@
-import net.driftingsouls.ds2.server.cargo.ResourceList;
-import net.driftingsouls.ds2.server.entities.User;
+import net.driftingsouls.ds2.server.framework.Common;
-import net.driftingsouls.ds2.server.framework.ContextMap;
-import net.driftingsouls.ds2.server.ships.Ship;
@@ -104 +105 @@
-         */
-        public void setLink( Base base ) {
+                // In einem Komplex darf eine Basis nur einmal vorkommen
+                if( (base != null) && (getKomplex() != null) ) {
+                        WerftObject[] members = getKomplex().getMembers();
+                        for( int i=0; i < members.length; i++ ) {
+                                if( !(members[i] instanceof ShipWerft) ) {
+                                        continue;
+                                }
+                                if( members[i].getWerftID() == this.getWerftID() ) {
+                                        continue;
+                                }
+                                
+                                ShipWerft member = (ShipWerft)members[i];
+                                if( member.getLinkedBase() == base ) {
+                                        return;
+                                }
+                        }
+                }
+                
-                linked = base;
-        }
@@ -409 +428 @@
-                return this.ship.getName();
-        }
+
+        @Override
+        public boolean isLinkableWerft() {
+                return this.ship.getTypeData().hasFlag(ShipTypes.SF_WERFTKOMPLEX);
+        }
+
+        @Override
+        public String getObjectUrl() {
+                return Common.buildUrl(ContextMap.getContext(), "default", "module", "schiff", "ship", ship.getId());
+        }
+
+        @Override
+        public void addToKomplex(WerftKomplex linkedWerft) {
+                super.addToKomplex(linkedWerft);
+                
+                // Falls notwendig den Link auf die Basis entfernen - in einem Komplex darf eine Basis
+                // nur einmal vorkommen
+                if( this.linked != null ) {
+                        WerftObject[] members = linkedWerft.getMembers();
+                        for( int i=0; i < members.length; i++ ) {
+                                if( !(members[i] instanceof ShipWerft) ) {
+                                        continue;
+                                }
+                                if( members[i].getWerftID() == this.getWerftID() ) {
+                                        continue;
+                                }
+                                
+                                ShipWerft member = (ShipWerft)members[i];
+                                if( member.getLinkedBase() == this.getLinkedBase() ) {
+                                        this.setLink(null);
+                                        return;
+                                }
+                        }
+                }
+        }
+
+        @Override
+        public void createKomplexWithWerft(WerftObject werft) {
+                super.createKomplexWithWerft(werft);
+                
+                // Falls notwendig den Link auf die Basis entfernen - in einem Komplex darf eine Basis
+                // nur einmal vorkommen
+                if( this.linked != null ) {
+                        WerftObject[] members = this.getKomplex().getMembers();
+                        for( int i=0; i < members.length; i++ ) {
+                                if( !(members[i] instanceof ShipWerft) ) {
+                                        continue;
+                                }
+                                if( members[i].getWerftID() == this.getWerftID() ) {
+                                        continue;
+                                }
+                                
+                                ShipWerft member = (ShipWerft)members[i];
+                                if( member.getLinkedBase() == this.getLinkedBase() ) {
+                                        this.setLink(null);
+                                        return;
+                                }
+                        }
+                }
+        }
-}

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

@@ -76 +76 @@
-         */
-        public String execute( WerftObject werft ) {
-                org.hibernate.Session db = context.getDB();
-        
-                int build = context.getRequest().getParameterInt("build");
-                int ws = context.getRequest().getParameterInt("ws");
+                int linkedwerft = context.getRequest().getParameterInt("linkedwerft");
-                
-                if( !t.set_file( "_WERFT.WERFTGUI", "werft.werftgui.html" ) ) {
@@ -85 +84 @@
-                        return "";
-                }
+                
+                // Werften aneinanderkoppelt
+                if( linkedwerft != 0 && werft.isLinkableWerft() ) {
+                        org.hibernate.Session db = context.getDB();
+                        
+                        if( werft.getKomplex() != null ) {
+                                werft.removeFromKomplex();
+                        }
+                        
+                        if( linkedwerft > 0 ) {
+                                WerftObject targetwerft = (WerftObject)db.get(WerftObject.class, linkedwerft);
+                                
+                                if( targetwerft == null || !targetwerft.isLinkableWerft() ) {
+                                        t.set_var("werftgui.msg", "Die Zielwerft ist ungueltigt");
+                                }
+                                else {
+                                        if( targetwerft.getKomplex() != null ) {
+                                                werft.addToKomplex(targetwerft.getKomplex());
+                                        }
+                                        else {
+                                                werft.createKomplexWithWerft(targetwerft);
+                                        }
+                                }
+                        }
+                }
+                
+                final String action = context.getRequest().getParameterString("werftact");
+                if( action.equals("removefromkomplex") ) {
+                        org.hibernate.Session db = context.getDB();
+                        
+                        WerftObject obj = (WerftObject)db.get(WerftObject.class, context.getRequest().getParameterInt("entry"));
+                        
+                        if( (obj != null) && obj.getKomplex() != null ) {
+                                obj.removeFromKomplex();
+                        }
+                }
+                
+                if( werft.getKomplex() != null ) {
+                        werft = werft.getKomplex();
+                }
+                
-                t.set_var(      "werftgui.formhidden",  werft.getFormHidden(),
-       
+
-                
-                // Baudialog
@@ -143 +183 @@
-                                
-                                final int position = context.getRequest().getParameterInt("entry");
-                                final String action = context.getRequest().getParameterString("werftact");
-                                
-                                if( action.equals("canclebuild") ) {
@@ -177 +216 @@
-                                t.set_var("werftgui.main.options", 1);
-                                
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                        
-                                        ShipTypeData shiptype = Ship.getShipType( shipid, true );
-                                        if( shiptype.getCost() == 0 ) {
-_WERFT.WERFTGUI", "werftgui.linkedbase.listitem", "werftgui
+werftgui.komplexparts.listitem", "komplexpart.linkedbase.listitem", "komplexpart
-                                                
-
-
-
-
+
+
+
-                                                        
-
-
-
+
+
-                                                List bases = db.createQuery("from Base " +
-                                                                        "where x=? and y=? and system=? and owner=? order by id")
-werft
-werft
-werft
-werft
+member
+member
+member
+member
-                                                                        .list();
-                                                for( Iterator iter=bases.iterator(); iter.hasNext(); ) {
-                                                        Base base = (Base)iter.next();
-                                                        
-linkedbase.selected", (linkedbase == base)
-
-
-werftgui.linkedbase.list", "werftgui
+komplexpart.linkedbase.selected",     linkedbase == base
+komplexpart.
+komplexpart.
+komplexpart.linkedbase.list", "komplexpart
-                                                }
-                                        }
-                                }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-

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

@@ -30 +30 @@
-import javax.persistence.Column;
-import javax.persistence.Ent