Changeset d95781aec2dc06ce9cdc85dff7e630bab6b21e4d

Show
Ignore:
Timestamp:
08/11/07 19:32:29 (1 year ago)
Author:
Christopher Jung <bktheg@web.de>
git-committer:
Christopher Jung <bktheg@web.de> 1186853549 +0200
git-parent:

[1ccc7e674e4fbdb0fa60f3b404b1b8ae372bfb87]

git-author:
Christopher Jung <bktheg@web.de> 1186853549 +0200
Message:

TechListe?: Umstellung auf Hibernate

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/net/driftingsouls/ds2/server/modules/TechListeController.java

    re1b01c8 rd95781a  
    2020 
    2121import java.util.HashMap; 
     22import java.util.Iterator; 
    2223import java.util.LinkedHashMap; 
     24import java.util.List; 
    2325import java.util.Map; 
    2426 
    …… 
    2931import net.driftingsouls.ds2.server.config.Rassen; 
    3032import net.driftingsouls.ds2.server.entities.Forschung; 
     33import net.driftingsouls.ds2.server.entities.Forschungszentrum; 
    3134import net.driftingsouls.ds2.server.entities.User; 
    3235import net.driftingsouls.ds2.server.framework.Common; 
    3336import net.driftingsouls.ds2.server.framework.Configuration; 
    3437import net.driftingsouls.ds2.server.framework.Context; 
    35 import net.driftingsouls.ds2.server.framework.db.Database; 
    36 import net.driftingsouls.ds2.server.framework.db.SQLQuery; 
    3738import net.driftingsouls.ds2.server.framework.pipeline.generators.DSGenerator; 
    3839import net.driftingsouls.ds2.server.framework.templates.TemplateEngine; 
    …… 
    7071        @Override 
    7172        public void defaultAction() { 
    72                 Database db = getDatabase(); 
     73                org.hibernate.Session db = getDB(); 
    7374                TemplateEngine t = getTemplateEngine(); 
    7475                User user = (User)getUser(); 
    …… 
    106107 
    107108                //Alle Forschungen durchgehen 
    108                 SQLQuery forschung = db.query("SELECT id FROM forschungen ORDER BY name"); 
    109                 while( forschung.next() ) { 
    110                         Forschung f = Forschung.getInstance(forschung.getInt("id")); 
     109                final Iterator forschungIter = db.createQuery("from Forschung order by name") 
     110                        .iterate(); 
     111                while( forschungIter.hasNext() ) { 
     112                        Forschung f = (Forschung)forschungIter.next(); 
    111113                         
    112114                        if( !Rassen.get().rasse(rasse).isMemberIn(f.getRace()) ) { 
    …… 
    131133                        } 
    132134                } 
    133                 forschung.free(); 
    134135 
    135136                t.set_block("_TECHLISTE","tech.listitem","none"); 
    …… 
    145146 
    146147                Map<Integer,Integer> currentResearches = new HashMap<Integer,Integer>(); 
    147                 SQLQuery resRow = db.query("SELECT t1.forschung,t1.dauer FROM fz AS t1,bases AS t2 WHERE t1.forschung>0 AND t1.col=t2.id AND t2.owner=",user.getID()); 
    148                 while( resRow.next() ) { 
    149                         currentResearches.put(resRow.getInt("forschung"), resRow.getInt("dauer")); 
    150                 } 
    151                 resRow.free(); 
     148                List resList = db.createQuery("from Forschungszentrum where forschung>0 and base.owner=?") 
     149                        .setEntity(0, user) 
     150                        .list(); 
     151                for( Iterator iter=resList.iterator(); iter.hasNext(); ) { 
     152                        Forschungszentrum fz = (Forschungszentrum)iter.next(); 
     153                        currentResearches.put(fz.getForschung(), fz.getDauer()); 
     154                } 
    152155 
    153156                for( String mykey : keys.keySet() ) {