Changeset 253f8ca1779aaed5336e611e7cc78c71fde30e60

Timestamp:

08/05/07 14:25:36 (1 year ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

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

git-parent:

[23e7f86cd7efb57d7586809a1db5aa31be3cfc6f]

git-author:

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

Message:

Forschungszentrum: Umstellung auf Hibernate

Files:

• db/tables/fz.sql (modified) (1 diff)
• db/updates.xml (modified) (1 diff)
• src/net/driftingsouls/ds2/server/bases/ForschungszentrumBuilding.java (modified) (22 diffs)
• src/net/driftingsouls/ds2/server/entities/Forschungszentrum.java (modified) (4 diffs)

db/tables/fz.sql

@@ -1 +1 @@
-CREATE TABLE `fz` (
-  `id` int(11) NOT NULL auto_increment,
-  `col` int(11) NOT NULL default '0',
-  `type` int(11) NOT NULL default '0',
-  `forschung` int(11) NOT NULL default '0',
-  `dauer` int(11) NOT NULL default '0',
-
-
+
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-

db/updates.xml

@@ -367 +367 @@
-                UPDATE buildings SET module='net.driftingsouls.ds2.server.bases.ForschungszentrumBuilding' WHERE module='net.driftingsouls.ds2.server.bases.Forschungszentrum';
-        ]]></update>
+        <update type="structure" datum="2007-08-05"><![CDATA[
+                ALTER TABLE `fz` DROP `id`;
+                ALTER TABLE `fz` ADD PRIMARY KEY ( `col` );
+                ALTER TABLE `fz` DROP INDEX `col`;
+        ]]></update>
-</updates>

src/net/driftingsouls/ds2/server/bases/ForschungszentrumBuilding.java

@@ -20 +20 @@
-
-import java.util.ArrayList;
+import java.util.Iterator;
-import java.util.List;
-
@@ -30 +31 @@
-import net.driftingsouls.ds2.server.config.Rassen;
-import net.driftingsouls.ds2.server.entities.Forschung;
+import net.driftingsouls.ds2.server.entities.Forschungszentrum;
-import net.driftingsouls.ds2.server.entities.User;
-import net.driftingsouls.ds2.server.framework.Common;
@@ -35 +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;
-import net.driftingsouls.ds2.server.framework.db.SQLResultRow;
-import net.driftingsouls.ds2.server.framework.templates.TemplateEngine;
-
@@ -67 +66 @@
-                        throw new RuntimeException("No Context available");
-                }
-
-
+
+
+
+
-        }
-
@@ -75 +76 @@
-                super.cleanup(context, base);
-                
-
+
+
+
+
-        }
-        
@@ -90 +94 @@
-        @Override
-        public boolean isActive(Base base, int status, int field) {
-Database db = ContextMap.getContext().getDatabase
-
-SQLResultRow forschungszentrum = db.first( "SELECT dauer FROM fz WHERE col=",
-!forschungszentrum.isEmpty() && (forschungszentrum.getInt("dauer"
+org.hibernate.Session db = ContextMap.getContext().getDB
+
+Forschungszentrum fz = (Forschungszentrum)db.get(Forschungszentrum.class, 
+(fz != null) && (fz.getDauer(
-                        return true;
-                }
-orschungszentrum.isEmpty()
+z == null
-                        LOG.warn("Forschungszentrum ohne fz-Eintrag auf Basis "+base.getID()+" gefunden");
-                }
@@ -104 +108 @@
-        @Override
-        public String echoShortcut(Context context, Base base, int field, int building) {
-Database db = context.getDatabase
+org.hibernate.Session db = context.getDB
-                
-                String sess = context.getSession();
-                
-                StringBuilder result = new StringBuilder(100);
-SQLResultRow fz = db.first("SELECT id,dauer,forschung FROM fz WHERE col="+
-!fz.isEmpty()
-Int("dauer"
+Forschungszentrum fz = (Forschungszentrum)db.get(Forschungszentrum.class, 
+fz != null
+Dauer(
-                                result.append("<a class=\"back\" href=\"./ds?module=building&amp;sess="+sess+"&amp;col="+base.getID()+"&amp;field="+field+"\">[F]</a>");
-                        }
-                        else {
-                                StringBuilder popup = new StringBuilder(Common.tableBegin( 350, "left" ).replace("\"", "'") );
-SQLResultRow forschung = db.first("SELECT name FROM forschungen WHERE id="+fz.getInt("forschung"
-Int("forschung"
-String("name"
-Int("dauer"
+Forschung forschung = Forschung.getInstance(fz.getForschung(
+Forschung(
+Name(
+Dauer(
-                                popup.append( Common.tableEnd().replace("\"", "'") );
-
@@ -126 +130 @@
-                                                "onmouseover=\"return overlib('<span style=\\'font-size:13px\\'>"+StringEscapeUtils.escapeJavaScript(popup.toString())+"</span>',REF,'p"+base.getID()+"_"+field+"',REFY,22,NOJUSTY,TIMEOUT,0,DELAY,150,WIDTH,280,BGCLASS,'gfxtooltip',FGCLASS,'gfxtooltip',TEXTFONTCLASS,'gfxtooltip');\" " +
-                                                "onmouseout=\"return nd();\" " +
-Int("dauer"
+Dauer(
-                        }
-                }
@@ -135 +139 @@
-        }
-        
-Base base
-Database db = context.getDatabase
+Forschungszentrum fz
+org.hibernate.Session db = context.getDB
-                String sess = context.getSession();
-                
@@ -148 +152 @@
-                echo.append("</tr>\n");
-        
+                Base base = fz.getBase();
-                Cargo cargo = base.getCargo();
-        
-                List<Integer> researches = new ArrayList<Integer>();
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                
-                boolean first = true;
@@ -229 +236 @@
-        
-        private void alreadyResearched( Context context, StringBuilder echo ) {
-Database db = context.getDatabase
+org.hibernate.Session db = context.getDB
-                String sess = context.getSession();
-                
@@ -237 +244 @@
-                echo.append("<tr><td class=\"noBorderX\" align=\"left\">Bereits erforscht:</td></tr>\n");
-        
-
-
-
-
-
-
+
+
+
+
+
-                                echo.append("<tr><td class=\"noBorderX\">\n");
-i+"\">"+Common._plaintitle(tech.getString("name"
+tech.getID()+"\">"+Common._plaintitle(tech.getName(
-                                echo.append("</td></tr>\n");
-                        }
@@ -251 +257 @@
-        }
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                        echo.append("<br /><br />\n");
-                        return true;
@@ -270 +272 @@
-        }
-        
-
-
+
-                String sess = context.getSession();
-                
@@ -278 +279 @@
-                        echo.append("Wollen sie die Forschung wirklich abbrechen?<br />\n");
-                        echo.append("Achtung: Es erfolgt keine R&uuml;ckerstattung der Resourcen!<br /><br />\n");
-base
+fz.getBase()
-                        echo.append("</div>\n");
-                        return;
-                }
-
+
+
+
+
-                echo.append("<div style=\"text-align:center;color:red;font-weight:bold\">\n");
-                echo.append("Forschung abgebrochen<br />\n");
@@ -288 +292 @@
-        }
-        
-
-
+
-                String sess = context.getSession();
-                User user = (User)context.getActiveUser();
-
-SQLResultRow fz = db.first("SELECT forschung,dauer FROM fz WHERE col="+base.getID()
-
+
+Base base = fz.getBase(
+       
-                Forschung tech = Forschung.getInstance(researchid);
-                boolean ok = true;
@@ -324 +327 @@
-        
-                // Wird bereits im Forschungszentrum geforscht?
-Int("forschung"
+Forschung(
-                        ok = false;
-                }
@@ -342 +345 @@
-        
-                // Alles bis hierhin ok -> nun zu den Resourcen!
-base.getCargo(
+new Cargo(base.getCargo()
-                ok = true;
-                
@@ -360 +363 @@
-                        echo.append("</div>\n");
-                        
-
-
-
+
+
-                        base.setCargo(cargo);
-                        
-                        if( !db.tCommit() ) {
-                                context.addError("Beim Starten der Forschung ist ein Fehler aufgetreten. Bitte versuchen sie es sp&auml;ter erneut");
-                        }
-                }
-        }
@@ -373 +371 @@
-        @Override
-        public String output(Context context, TemplateEngine t, Base base, int field, int building) {
-Database db = context.getDatabase
+org.hibernate.Session db = context.getDB
-
-                String sess = context.getSession();
@@ -387 +385 @@
-                StringBuilder echo = new StringBuilder(2000);
-                
-SQLResultRow fz = db.first("SELECT id FROM fz WHERE col="+
-.isEmpty()
+Forschungszentrum fz = (Forschungszentrum)db.get(Forschungszentrum.class, 
+ == null
-                        echo.append("<span style=\"color:red\">Fehler: Dieses Forschungszentrum hat keinen Datenbank-Eintrag</span>\n");
-                        return echo.toString();
@@ -416 +414 @@
-                if( (kill.length() != 0) || (research != 0) ) {
-                        if( kill.length() != 0 ) {
-base
+fz
-                        }
-                        if( research != 0 ) {
-research, base
+fz, research
-                        }
-                }
-                else if( show.equals("newres") ) {
-base
-base
+fz
+fz
-                        }
-                } 

src/net/driftingsouls/ds2/server/entities/Forschungszentrum.java

@@ -21 +21 @@
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-JoinColumn
-ManyToOne
+OneToOne
+PrimaryKeyJoinColumn
-import javax.persistence.Table;
-
@@ -37 +36 @@
-@Table(name="fz")
-public class Forschungszentrum {
- @GeneratedValue
-id
-Many
-JoinColumn(name="col")
+
+col
+One
+PrimaryKeyJoinColumn
-        private Base base;
-        private int type;
@@ -75 +74 @@
-         */
-        public void setBase(Base base) {
+                this.col = base.getID();
-                this.base = base;
-        }
@@ -127 +127 @@
-
-        /**
-s Forschungszentrums zurueck
-
+r Basis zurueck, auf der das Forschungszentrum steht
+ Der Basis
-         */
-
-id
+Base
+col
-        }
-}