Changeset a53bf3df2ee843c7dcbff98462aa9c06d33cf7c1

Timestamp:

07/20/08 18:05:12 (1 month ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

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

git-parent:

[f76390b959038f5635e9e51ab381b567ff6d78d0]

git-author:

Sebastian Gift <Madison@gt-knm.de> 1216569912 +0200

Message:

[feature] Die Position und der Typ eines Schiffes koennen jetzt ebenfalls geaendert werden.

Files:

• src/net/driftingsouls/ds2/server/modules/admin/EditShip.java (modified) (6 diffs)

src/net/driftingsouls/ds2/server/modules/admin/EditShip.java

@@ -20 +20 @@
-
-import java.util.HashMap;
+import java.util.List;
-import java.util.Map;
-
@@ -34 +35 @@
-import net.driftingsouls.ds2.server.modules.AdminController;
-import net.driftingsouls.ds2.server.ships.Ship;
+import net.driftingsouls.ds2.server.ships.ShipType;
-import net.driftingsouls.ds2.server.ships.ShipTypeData;
-
@@ -44 +46 @@
-public class EditShip implements AdminPlugin
-{
+        @SuppressWarnings("unchecked")
-        public void output(AdminController controller, String page, int action)
-        {
@@ -74 +77 @@
-                                ship.setOwner(owner);
-                        }
+                        ShipType type = (ShipType)db.get(ShipType.class, context.getRequest().getParameterInt("type"));
+                        if(type != null)
+                        {
+                                ship.setBaseType(type);
+                        }
+                        ship.setSystem(context.getRequest().getParameterInt("system"));
+                        ship.setX(context.getRequest().getParameterInt("x"));
+                        ship.setY(context.getRequest().getParameterInt("y"));
-                        ship.setHull(context.getRequest().getParameterInt("hull"));
-                        ship.setAblativeArmor(context.getRequest().getParameterInt("ablativearmor"));
@@ -121 +132 @@
-                        
-                        
+                        Map<Integer, String> shiptypes = new HashMap<Integer, String>();
+                        List<ShipType> types = (List<ShipType>)db.createQuery("from ShipType").list();
+                        for(ShipType shiptype: types)
+                        {
+                                shiptypes.put(shiptype.getId(), shiptype.getNickname());
+                        }
+                        
+                        
-                        echo.append("<form action=\"./ds\" method=\"post\">");
-                        echo.append("<table class=\"noBorder\" width=\"100%\">");
@@ -130 +149 @@
-                        echo.append("<tr><td class=\"noBorderS\">Name: </td><td><input type=\"text\" name=\"name\" value=\"" + ship.getName() + "\"></td></tr>\n");
-                        echo.append("<tr><td class=\"noBorderS\">Besitzer: </td><td><input type=\"text\" name=\"owner\" value=\"" + ship.getOwner().getId() + "\"></td><td class=\"noBorderS\">"+ Common._title(ship.getOwner().getNickname()) +"</td></tr>\n");
+                        echo.append("<tr><td class=\"noBorderS\">System: </td><td><input type=\"text\" name=\"system\" value=\"" + ship.getSystem() + "\"></td></tr>\n");
+                        echo.append("<tr><td class=\"noBorderS\">x: </td><td><input type=\"text\" name=\"x\" value=\"" + ship.getX() + "\"></td></tr>\n");
+                        echo.append("<tr><td class=\"noBorderS\">y: </td><td><input type=\"text\" name=\"y\" value=\"" + ship.getY() + "\"></td></tr>\n");
+                        echo.append("<tr><td class=\"noBorderS\">Schiffstyp: </td><td><select size=\"1\" name=\"type\" \">");
+                        for(Map.Entry<Integer, String> shiptype: shiptypes.entrySet())
+                        {
+                                echo.append("<option value=\""+ shiptype.getKey() +"\" " + (shiptype.getKey().equals(ship.getBaseType().getId()) ? "selected=\"selected\"" : "") + " />"+shiptype.getValue()+"</option>");
+                        }
+                        echo.append("</select></td></tr>\n");
-                        echo.append("<tr><td class=\"noBorderS\">Huelle: </td><td><input type=\"text\" name=\"hull\" value=\"" + ship.getHull() + "\"></td><td class=\"noBorderS\">/ "+type.getHull()+"</td></tr>\n");
-                        echo.append("<tr><td class=\"noBorderS\">Ablative Panzerung: </td><td><input type=\"text\" name=\"ablativearmor\" value=\"" + ship.getAblativeArmor() + "\"></td><td class=\"noBorderS\">/ "+type.getAblativeArmor()+"</td></tr>\n");