diff --git a/.classpath b/.classpath index fa98c230d..0720642d8 100644 --- a/.classpath +++ b/.classpath @@ -2,13 +2,13 @@ - - - - - + + + + + diff --git a/.project b/.project index 8c4533f0c..6464f57b8 100644 --- a/.project +++ b/.project @@ -15,8 +15,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature org.maven.ide.eclipse.maven2Nature diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 1855e5851..a2bf241bf 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,6 @@ -#Thu Apr 28 15:32:21 BRT 2011 +#Tue Sep 13 16:51:09 BRT 2011 eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..5440394ac --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,5 @@ +#Tue Sep 13 15:33:16 BRT 2011 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/pom.xml b/pom.xml index 22dea8573..cb3c35810 100644 --- a/pom.xml +++ b/pom.xml @@ -8,6 +8,59 @@ Lineage II server emulator 2011 + + package + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-jar-plugin + + + + true + libs/ + com.l2jserver.L2JGameServerMain + + + + + + assembly + + jar + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + src/assembly/distribution-mysql5-bin.xml + src/assembly/distribution-h2-bin.xml + src/assembly/distribution-src.xml + + + + + + @@ -170,58 +223,10 @@ git://github.com/Rogiel/l2jserver2-gs.git - ssh://git@github.com:Rogiel/l2jserver2-gs.git - + ssh://git@github.com:Rogiel/l2jserver2-gs.git master https://github.com/Rogiel/l2jserver2-gs - - package - - - org.apache.maven.plugins - maven-surefire-plugin - 2.8.1 - - true - - - - org.apache.maven.plugins - maven-jar-plugin - 2.3.1 - - - - true - libs/ - com.l2jserver.L2JGameServerMain - - - - - - assembly - - jar - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.2.1 - - - src/assembly/distribution-mysql5-bin.xml - src/assembly/distribution-h2-bin.xml - src/assembly/distribution-src.xml - - - - - repository.jboss.org diff --git a/src/main/java/com/l2jserver/model/world/character/CharacterStats.java b/src/main/java/com/l2jserver/model/world/character/CharacterStats.java index 55caef4ad..4007f9889 100644 --- a/src/main/java/com/l2jserver/model/world/character/CharacterStats.java +++ b/src/main/java/com/l2jserver/model/world/character/CharacterStats.java @@ -261,6 +261,7 @@ public class CharacterStats extends ActorStats { */ private final L2Character character; + @SuppressWarnings("unchecked") private static final CharacterCalculator calculator = new CharacterCalculator( StatType.class); diff --git a/src/main/java/com/l2jserver/service/ServiceConfiguration.java b/src/main/java/com/l2jserver/service/ServiceConfiguration.java new file mode 100644 index 000000000..1e8bdd154 --- /dev/null +++ b/src/main/java/com/l2jserver/service/ServiceConfiguration.java @@ -0,0 +1,28 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.service; + +import com.l2jserver.service.configuration.Configuration; + +/** + * Base interface for all {@link Service} {@link Configuration} classes. + * + * @author Rogiel + */ +public interface ServiceConfiguration extends Configuration { + +} diff --git a/src/main/java/com/l2jserver/service/ServiceModule.java b/src/main/java/com/l2jserver/service/ServiceModule.java index 9e7c8f43a..3af365bb7 100644 --- a/src/main/java/com/l2jserver/service/ServiceModule.java +++ b/src/main/java/com/l2jserver/service/ServiceModule.java @@ -27,8 +27,8 @@ import com.l2jserver.service.core.Log4JLoggingService; import com.l2jserver.service.core.LoggingService; import com.l2jserver.service.core.threading.ThreadService; import com.l2jserver.service.core.threading.ThreadServiceImpl; -import com.l2jserver.service.core.vfs.VFSService; import com.l2jserver.service.core.vfs.Java7VFSService; +import com.l2jserver.service.core.vfs.VFSService; import com.l2jserver.service.database.DatabaseService; import com.l2jserver.service.database.JDBCDatabaseService; import com.l2jserver.service.game.AttackService; diff --git a/src/main/java/com/l2jserver/service/core/vfs/VFSService.java b/src/main/java/com/l2jserver/service/core/vfs/VFSService.java index 52f1994bb..339daa717 100644 --- a/src/main/java/com/l2jserver/service/core/vfs/VFSService.java +++ b/src/main/java/com/l2jserver/service/core/vfs/VFSService.java @@ -20,6 +20,7 @@ import java.net.URI; import java.nio.file.Path; import com.l2jserver.service.Service; +import com.l2jserver.service.ServiceConfiguration; import com.l2jserver.service.configuration.Configuration; import com.l2jserver.service.configuration.Configuration.ConfigurationName; @@ -37,7 +38,7 @@ public interface VFSService extends Service { * @see Configuration */ @ConfigurationName("vfs") - public interface VFSConfiguration extends Configuration { + public interface VFSConfiguration extends ServiceConfiguration { /** * @return the VFS root {@link URI} */ diff --git a/src/main/java/com/l2jserver/service/database/DatabaseService.java b/src/main/java/com/l2jserver/service/database/DatabaseService.java index b6666f42f..2abbb4d32 100644 --- a/src/main/java/com/l2jserver/service/database/DatabaseService.java +++ b/src/main/java/com/l2jserver/service/database/DatabaseService.java @@ -19,6 +19,7 @@ package com.l2jserver.service.database; import com.l2jserver.model.Model; import com.l2jserver.model.id.ID; import com.l2jserver.service.Service; +import com.l2jserver.service.ServiceConfiguration; import com.l2jserver.service.configuration.Configuration; import com.l2jserver.service.configuration.Configuration.ConfigurationName; @@ -45,7 +46,7 @@ public interface DatabaseService extends Service { * @see Configuration */ @ConfigurationName("database") - public interface DatabaseConfiguration extends Configuration { + public interface DatabaseConfiguration extends ServiceConfiguration { } , I extends ID> DataAccessObject getDAO( diff --git a/src/main/java/com/l2jserver/service/game/template/TemplateService.java b/src/main/java/com/l2jserver/service/game/template/TemplateService.java index 878a0ebc3..90e865720 100644 --- a/src/main/java/com/l2jserver/service/game/template/TemplateService.java +++ b/src/main/java/com/l2jserver/service/game/template/TemplateService.java @@ -24,6 +24,7 @@ import com.l2jserver.model.world.Item; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.NPC; import com.l2jserver.service.Service; +import com.l2jserver.service.ServiceConfiguration; /** * Service that loads {@link L2Character}, {@link NPC}, {@link Item} and @@ -36,6 +37,9 @@ import com.l2jserver.service.Service; * @author Rogiel */ public interface TemplateService extends Service { + public interface TemplateServiceConfiguration extends ServiceConfiguration { + } + /** * Get the template assigned with id * diff --git a/src/main/java/com/l2jserver/service/game/template/XMLTemplateService.java b/src/main/java/com/l2jserver/service/game/template/XMLTemplateService.java index cce233c98..eeca18805 100644 --- a/src/main/java/com/l2jserver/service/game/template/XMLTemplateService.java +++ b/src/main/java/com/l2jserver/service/game/template/XMLTemplateService.java @@ -53,7 +53,6 @@ import com.l2jserver.service.ServiceStartException; import com.l2jserver.service.ServiceStopException; import com.l2jserver.service.cache.Cache; import com.l2jserver.service.cache.CacheService; -import com.l2jserver.service.configuration.Configuration; import com.l2jserver.service.configuration.Configuration.ConfigurationName; import com.l2jserver.service.configuration.ConfigurationService; import com.l2jserver.service.core.LoggingService; @@ -85,9 +84,10 @@ public class XMLTemplateService extends AbstractService implements @SuppressWarnings("rawtypes") private Cache templates; - + @ConfigurationName("template") - public interface XMLTemplateServiceConfiguration extends Configuration { + public interface XMLTemplateServiceConfiguration extends + TemplateServiceConfiguration { @ConfigurationPropertyGetter(name = "template.directory", defaultValue = "data/templates") URI getTemplateDirectory(); diff --git a/src/main/java/com/l2jserver/service/network/NetworkService.java b/src/main/java/com/l2jserver/service/network/NetworkService.java index 514690ae5..c187857e3 100644 --- a/src/main/java/com/l2jserver/service/network/NetworkService.java +++ b/src/main/java/com/l2jserver/service/network/NetworkService.java @@ -25,6 +25,7 @@ import com.l2jserver.game.net.packet.ServerPacket; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.world.L2Character; import com.l2jserver.service.Service; +import com.l2jserver.service.ServiceConfiguration; import com.l2jserver.service.configuration.Configuration; import com.l2jserver.service.configuration.Configuration.ConfigurationName; @@ -71,7 +72,7 @@ public interface NetworkService extends Service { * @author Rogiel */ @ConfigurationName("network") - public interface NetworkConfiguration extends Configuration { + public interface NetworkConfiguration extends ServiceConfiguration { /** * Get the server listen address * @@ -90,7 +91,6 @@ public interface NetworkService extends Service { void setListenAddress(InetSocketAddress addr); } - /** * Registers a new client * diff --git a/src/main/java/com/l2jserver/util/geometry/Coordinate.java b/src/main/java/com/l2jserver/util/geometry/Coordinate.java index 5c1124693..0e106b146 100644 --- a/src/main/java/com/l2jserver/util/geometry/Coordinate.java +++ b/src/main/java/com/l2jserver/util/geometry/Coordinate.java @@ -26,8 +26,6 @@ import org.apache.commons.math.geometry.Vector3D; * @author Rogiel */ public class Coordinate { - private static final long serialVersionUID = 1L; - /** * The backing vector of this Coordinate */