Rogiel/l2jserver2
1
0
Fork 0
mirror of https://github.com/Rogiel/l2jserver2 synced 2025-12-06 07:32:46 +00:00
Code Releases Activity

Database connection pool

Browse Source 
Signed-off-by: Rogiel <rogiel@rogiel.com>
This commit is contained in:
Rogiel Sulzbach
2011-05-13 12:58:16 -03:00
parent 38612ea298
commit da28654510
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/l2jserver/service/game/template/StaticTemplateService.java
View File

@@ -59,7 +59,6 @@ public class StaticTemplateService extends AbstractService implements
public void addTemplate(Class<? extends Template<?>> t) { public void addTemplate(Class<? extends Template<?>> t) {
final Template<?> template = injector.getInstance(t); final Template<?> template = injector.getInstance(t);
System.out.println(template.getID() + " -> " + template);
if (template.getID() != null) if (template.getID() != null)
templates.put(template.getID(), template); templates.put(template.getID(), template);
} }

11
src/test/java/com/l2jserver/model/id/factory/IDFactoryTest.java
View File

@@ -16,6 +16,8 @@ import com.l2jserver.service.BasicServiceModule;
import com.l2jserver.service.ServiceModule; import com.l2jserver.service.ServiceModule;
import com.l2jserver.service.ServiceStartException; import com.l2jserver.service.ServiceStartException;
import com.l2jserver.service.database.DatabaseService; import com.l2jserver.service.database.DatabaseService;
import com.l2jserver.service.game.scripting.ScriptingService;
import com.l2jserver.service.game.template.TemplateService;
public class IDFactoryTest { public class IDFactoryTest {
private final Injector injector = Guice.createInjector(new ServiceModule(), private final Injector injector = Guice.createInjector(new ServiceModule(),
@@ -42,14 +44,17 @@ public class IDFactoryTest {
@Test @Test
public void testGetObject() throws ServiceStartException { public void testGetObject() throws ServiceStartException {
BasicConfigurator.configure(); BasicConfigurator.configure();
injector.getInstance(ScriptingService.class).start();
injector.getInstance(TemplateService.class).start();
injector.getInstance(DatabaseService.class).start(); injector.getInstance(DatabaseService.class).start();
final CharacterID id1 = charIdFactory.createID(268435456); final CharacterID id = charIdFactory.createID(268437456);
final L2Character character = id1.getObject(); final L2Character character = id.getObject();
Assert.assertNotNull(character);
System.out.println(character.getAppearance().getHairColor()); System.out.println(character.getAppearance().getHairColor());
Assert.assertNotNull(character); Assert.assertNotNull(character);
Assert.assertEquals(id1, character.getID()); Assert.assertEquals(id, character.getID());
} }
} }

3
src/tool/java/com/l2jserver/tool/CharacterSQLEnumGenerator.java
View File

@@ -12,7 +12,8 @@ public class CharacterSQLEnumGenerator {
final StringBuilder builder = new StringBuilder(); final StringBuilder builder = new StringBuilder();
builder.append("ALTER TABLE `character` CHANGE `class` `class` ENUM("); builder.append("ALTER TABLE `character` CHANGE `class` `class` ENUM(");
for (CharacterClass c : CharacterClass.values()) { for (CharacterClass c : CharacterClass.values()) {
builder.append("'" + c.name() + "',"); if (!c.name().startsWith("DUMMY"))
builder.append("'" + c.name() + "',");
} }
builder.replace(builder.length() - 1, builder.length(), ""); builder.replace(builder.length() - 1, builder.length(), "");
builder.append(") CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL DEFAULT 'HUMAN_FIGHTER';"); builder.append(") CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL DEFAULT 'HUMAN_FIGHTER';");