Rogiel/l2jserver2
1
0
Fork 0
mirror of https://github.com/Rogiel/l2jserver2 synced 2025-12-10 09:22:49 +00:00
Code Releases Activity

TeleporterTemplate

Browse Source 
Signed-off-by: Rogiel <rogiel@rogiel.com>
This commit is contained in:
Rogiel Sulzbach
2011-05-25 00:54:21 -03:00
parent cc44946831
commit ad6a2e89d2
9129 changed files with 128 additions and 673228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/l2jserver/service/game/template/ScriptTemplateService.java
View File

@@ -73,7 +73,7 @@ public class ScriptTemplateService extends AbstractService implements
@Override
@SuppressWarnings("unchecked")
public <T extends Template<?>> T getTemplate(TemplateID<T> id) {
public <T extends Template<?>> T getTemplate(TemplateID<T, ?> id) {
Preconditions.checkNotNull(id, "id");
return (T) templates.get(id);
}

2
src/main/java/com/l2jserver/service/game/template/TemplateService.java
View File

@@ -30,7 +30,7 @@ public interface TemplateService extends Service {
* the template id
* @return the template
*/
<T extends Template<?>> T getTemplate(TemplateID<T> id);
<T extends Template<?>> T getTemplate(TemplateID<T, ?> id);
/**
* Reload the template list.

14
src/main/java/com/l2jserver/service/game/template/XMLTemplateService.java
View File

@@ -32,6 +32,7 @@ import com.l2jserver.model.id.TemplateID;
import com.l2jserver.model.template.CharacterTemplate;
import com.l2jserver.model.template.ItemTemplate;
import com.l2jserver.model.template.NPCTemplate;
import com.l2jserver.model.template.TeleportationTemplate;
import com.l2jserver.model.template.Template;
import com.l2jserver.service.AbstractService;
import com.l2jserver.service.AbstractService.Depends;
@@ -43,6 +44,7 @@ import com.l2jserver.util.factory.CollectionFactory;
import com.l2jserver.util.jaxb.CharacterTemplateIDAdapter;
import com.l2jserver.util.jaxb.ItemTemplateIDAdapter;
import com.l2jserver.util.jaxb.NPCTemplateIDAdapter;
import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter;
@Depends({ LoggingService.class, ConfigurationService.class })
public class XMLTemplateService extends AbstractService implements
@@ -51,6 +53,7 @@ public class XMLTemplateService extends AbstractService implements
private final NPCTemplateIDAdapter npcTemplateIdAdapter;
private final ItemTemplateIDAdapter itemTemplateIdAdapter;
private final CharacterTemplateIDAdapter charIdTemplateAdapter;
private final TeleportationTemplateIDAdapter teleportationIdTemplateAdapter;
private JAXBContext context;
private Unmarshaller unmarshaller;
@@ -62,18 +65,21 @@ public class XMLTemplateService extends AbstractService implements
public XMLTemplateService(ConfigurationService configService,
NPCTemplateIDAdapter npcTemplateIdAdapter,
ItemTemplateIDAdapter itemTemplateIdAdapter,
CharacterTemplateIDAdapter charIdTemplateAdapter) {
CharacterTemplateIDAdapter charIdTemplateAdapter,
TeleportationTemplateIDAdapter teleportationIdTemplateAdapter) {
this.config = configService.get(XMLTemplateServiceConfiguration.class);
this.npcTemplateIdAdapter = npcTemplateIdAdapter;
this.itemTemplateIdAdapter = itemTemplateIdAdapter;
this.charIdTemplateAdapter = charIdTemplateAdapter;
this.teleportationIdTemplateAdapter = teleportationIdTemplateAdapter;
}
@Override
protected void doStart() throws ServiceStartException {
try {
context = JAXBContext.newInstance(CharacterTemplate.class,
NPCTemplate.class, ItemTemplate.class);
NPCTemplate.class, ItemTemplate.class,
TeleportationTemplate.class);
unmarshaller = context.createUnmarshaller();
unmarshaller.setAdapter(NPCTemplateIDAdapter.class,
@@ -82,6 +88,8 @@ public class XMLTemplateService extends AbstractService implements
itemTemplateIdAdapter);
unmarshaller.setAdapter(CharacterTemplateIDAdapter.class,
charIdTemplateAdapter);
unmarshaller.setAdapter(TeleportationTemplateIDAdapter.class,
teleportationIdTemplateAdapter);
@SuppressWarnings("unchecked")
Collection<File> files = FileUtils
@@ -97,7 +105,7 @@ public class XMLTemplateService extends AbstractService implements
@Override
@SuppressWarnings("unchecked")
public <T extends Template<?>> T getTemplate(TemplateID<T> id) {
public <T extends Template<?>> T getTemplate(TemplateID<T, ?> id) {
Preconditions.checkNotNull(id, "id");
return (T) templates.get(id);
}