Changeset 402c07212c0463d29ea0bed37253311b835a35c9

Show
Ignore:
Timestamp:
06/06/07 17:41:05 (1 year ago)
Author:
Christopher Jung <bktheg@web.de>
git-committer:
Christopher Jung <bktheg@web.de> 1181144465 +0200
git-parent:

[c8ee59d2fe333f9b95e559ad648ea8877def4ada]

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

Forschung auf Hibernate umgestellt

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/net/driftingsouls/ds2/server/bases/Forschungszentrum.java

    r3924571 r402c072  
    2121import java.util.ArrayList; 
    2222import java.util.List; 
    23 import java.util.Map; 
    24  
    25 import net.driftingsouls.ds2.server.Forschung; 
     23 
    2624import net.driftingsouls.ds2.server.cargo.Cargo; 
    2725import net.driftingsouls.ds2.server.cargo.ResourceEntry; 
    2826import net.driftingsouls.ds2.server.cargo.ResourceList; 
    2927import net.driftingsouls.ds2.server.config.Rassen; 
     28import net.driftingsouls.ds2.server.entities.Forschung; 
    3029import net.driftingsouls.ds2.server.framework.Common; 
    3130import net.driftingsouls.ds2.server.framework.Configuration; 
    …… 
    151150                boolean first = true; 
    152151         
    153                 Map<Integer,Forschung> map = Forschung.getSpecial("", "name"); 
    154                 for( Forschung tech : map.values() ) { 
     152                List<Forschung> forschungen = context.query("from Forschung order by name", Forschung.class); 
     153                for( Forschung tech : forschungen ) { 
    155154                        if( !Rassen.get().rasse(user.getRace()).isMemberIn(tech.getRace()) ) { 
    156155                                continue;        
    …… 
    198197                                echo.append("<img style=\"vertical-align:middle\" src=\""+Configuration.getSetting("URL")+"data/interface/time.gif\" alt=\"Dauer\" />"+tech.getTime()+" "); 
    199198                                 
    200                                 Cargo costs = new Cargo( Cargo.Type.STRING, tech.getCosts() ); 
     199                                Cargo costs = tech.getCosts(); 
    201200                                costs.setOption( Cargo.Option.SHOWMASS, false ); 
    202201                                 
    …… 
    293292                } 
    294293                 
    295                 Cargo techCosts = new Cargo( Cargo.Type.STRING, tech.getCosts() ); 
     294                Cargo techCosts = tech.getCosts(); 
    296295                techCosts.setOption( Cargo.Option.SHOWMASS, false ); 
    297296         

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

    rc8ee59d r402c072  
    2121import java.util.List; 
    2222 
    23 import net.driftingsouls.ds2.server.Forschung; 
    2423import net.driftingsouls.ds2.server.bases.Building; 
    2524import net.driftingsouls.ds2.server.bases.Core; 
    …… 
    3231import net.driftingsouls.ds2.server.config.Weapons; 
    3332import net.driftingsouls.ds2.server.entities.Ammo; 
     33import net.driftingsouls.ds2.server.entities.Forschung; 
    3434import net.driftingsouls.ds2.server.framework.Common; 
    3535import net.driftingsouls.ds2.server.framework.Configuration; 
    …… 
    146146                 
    147147                // Kosten 
    148                 Cargo costs = new Cargo( Cargo.Type.STRING, this.research.getCosts() ); 
     148                Cargo costs = this.research.getCosts(); 
    149149                costs.setOption( Cargo.Option.SHOWMASS, false ); 
    150150 

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

    rc8ee59d r402c072  
    2424import java.util.Map.Entry; 
    2525 
    26 import org.apache.commons.lang.StringEscapeUtils; 
    27 import org.apache.commons.lang.StringUtils; 
    28  
    29 import net.driftingsouls.ds2.server.Forschung; 
    3026import net.driftingsouls.ds2.server.cargo.Cargo; 
    3127import net.driftingsouls.ds2.server.cargo.ItemCargoEntry; 
    …… 
    4743import net.driftingsouls.ds2.server.config.Weapons; 
    4844import net.driftingsouls.ds2.server.entities.Ammo; 
     45import net.driftingsouls.ds2.server.entities.Forschung; 
    4946import net.driftingsouls.ds2.server.framework.Common; 
    5047import net.driftingsouls.ds2.server.framework.Configuration; 
    …… 
    5956import net.driftingsouls.ds2.server.ships.ShipTypeData; 
    6057import net.driftingsouls.ds2.server.ships.ShipTypes; 
     58 
     59import org.apache.commons.lang.StringEscapeUtils; 
     60import org.apache.commons.lang.StringUtils; 
    6161 
    6262/** 

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

    rc8ee59d r402c072  
    2222import java.util.Map; 
    2323 
    24 import org.apache.commons.lang.StringUtils; 
    25  
    26 import net.driftingsouls.ds2.server.Forschung; 
    2724import net.driftingsouls.ds2.server.cargo.Cargo; 
    2825import net.driftingsouls.ds2.server.cargo.ResourceEntry; 
    …… 
    3330import net.driftingsouls.ds2.server.config.Weapon; 
    3431import net.driftingsouls.ds2.server.config.Weapons; 
     32import net.driftingsouls.ds2.server.entities.Forschung; 
    3533import net.driftingsouls.ds2.server.framework.Common; 
    3634import net.driftingsouls.ds2.server.framework.Context; 
    …… 
    4341import net.driftingsouls.ds2.server.ships.ShipClasses; 
    4442import net.driftingsouls.ds2.server.ships.ShipTypes; 
     43 
     44import org.apache.commons.lang.StringUtils; 
    4545 
    4646/** 

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

    r3924571 r402c072  
    2525import java.util.Map; 
    2626 
    27 import net.driftingsouls.ds2.server.Forschung; 
    2827import net.driftingsouls.ds2.server.cargo.Cargo; 
    2928import net.driftingsouls.ds2.server.cargo.Resources; 
     29import net.driftingsouls.ds2.server.entities.Forschung; 
    3030import net.driftingsouls.ds2.server.framework.Common; 
    3131import net.driftingsouls.ds2.server.framework.Context; 
    …… 
    284284                                        Forschung forschung = Forschung.getInstance(a); 
    285285                                        if( forschung != null ) { 
    286                                                 Cargo cargo = new Cargo(Cargo.Type.STRING, forschung.getCosts()); 
     286                                                Cargo cargo = forschung.getCosts(); 
    287287                                                ress.put( i, ress.get(i) + cargo.getResourceCount( Resources.SILIZIUM ) ); 
    288288                                                resi.put(i, resi.get(i) + cargo.getResourceCount( Resources.ISOCHIPS ) ); 

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

    rf27e593 r402c072  
    2323import java.util.Map; 
    2424 
    25 import org.apache.commons.lang.StringEscapeUtils; 
    26  
    27 import net.driftingsouls.ds2.server.Forschung; 
    2825import net.driftingsouls.ds2.server.cargo.Cargo; 
    2926import net.driftingsouls.ds2.server.cargo.ResourceEntry; 
    …… 
    3128import net.driftingsouls.ds2.server.config.Rasse; 
    3229import net.driftingsouls.ds2.server.config.Rassen; 
     30import net.driftingsouls.ds2.server.entities.Forschung; 
    3331import net.driftingsouls.ds2.server.framework.Common; 
    3432import net.driftingsouls.ds2.server.framework.Configuration; 
    …… 
    3937import net.driftingsouls.ds2.server.framework.pipeline.generators.DSGenerator; 
    4038import net.driftingsouls.ds2.server.framework.templates.TemplateEngine; 
     39 
     40import org.apache.commons.lang.StringEscapeUtils; 
    4141 
    4242/** 
    …… 
    173173 
    174174                                // Kosten der Forschung ausgeben 
    175                                 Cargo costs = new Cargo(Cargo.Type.STRING, result.getCosts()); 
     175                                Cargo costs = result.getCosts(); 
    176176                                costs.setOption(Cargo.Option.SHOWMASS, false); 
    177177 

  • src/net/driftingsouls/ds2/server/tick/regular/ForschungsTick.java

    r3924571 r402c072  
    2121import java.util.HashSet; 
    2222 
    23 import net.driftingsouls.ds2.server.Forschung; 
    2423import net.driftingsouls.ds2.server.comm.PM; 
     24import net.driftingsouls.ds2.server.entities.Forschung; 
    2525import net.driftingsouls.ds2.server.framework.Common; 
    2626import net.driftingsouls.ds2.server.framework.User; 

  • web/WEB-INF/cfg/hibernatemappings.xml

    r6422552 r402c072  
    2525        <mapping class="net.driftingsouls.ds2.server.entities.FactionShopEntry" /> 
    2626        <mapping class="net.driftingsouls.ds2.server.entities.FactionShopOrder" /> 
    27         <!-- forschungen [net.driftingsouls.ds2.server.Forschung migrieren] --> 
     27        <mapping class="net.driftingsouls.ds2.server.entities.Forschung" /> 
    2828        <mapping class="net.driftingsouls.ds2.server.entities.Forschungszentrum" /> 
    2929        <!-- global_sectortemplates [net.driftingsouls.ds2.server.SectorTemplateManager migrieren] -->