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

Refactored "src/dao" source folder to "src/main/java".

Browse Source
This commit is contained in:
Rogiel Sulzbach
2011-08-07 22:36:47 -03:00
parent 074f216ffc
commit 6b28b48ae7
48 changed files with 114 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.classpath
View File

@@ -2,7 +2,6 @@
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry excluding="mysql5/|db4o/|neodatis/|h2/" kind="src" path="src/dao"/>
<classpathentry kind="src" output="target/scripts" path="data/script/quest"/>
<classpathentry kind="src" output="target/scripts" path="data/script/ai"/>
<classpathentry kind="src" output="target/scripts" path="data/plugin"/>

2
src/main/java/com/l2jserver/GameServerModule.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver;
import com.google.inject.AbstractModule;
import com.google.inject.Module;
import com.l2jserver.db.MySQL5DAOModule;
import com.l2jserver.model.MySQL5DAOModule;
import com.l2jserver.model.id.provider.IDProviderModule;
import com.l2jserver.service.ServiceModule;

2
src/main/java/com/l2jserver/game/net/packet/client/CM_AUTH_LOGIN.java
View File

@@ -21,11 +21,11 @@ import java.util.List;
import org.jboss.netty.buffer.ChannelBuffer;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.Lineage2Session;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.game.net.packet.server.SM_CHAR_LIST;
import com.l2jserver.model.dao.CharacterDAO;
import com.l2jserver.model.id.AccountID;
import com.l2jserver.model.id.provider.AccountIDProvider;
import com.l2jserver.model.world.L2Character;

2
src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CREATE.java
View File

@@ -21,11 +21,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.game.net.packet.server.SM_CHAR_CREATE_FAIL;
import com.l2jserver.game.net.packet.server.SM_CHAR_CREATE_OK;
import com.l2jserver.model.dao.CharacterDAO;
import com.l2jserver.model.id.object.CharacterID;
import com.l2jserver.model.id.object.provider.CharacterIDProvider;
import com.l2jserver.model.id.template.CharacterTemplateID;

2
src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java
View File

@@ -21,10 +21,10 @@ import java.util.List;
import org.jboss.netty.buffer.ChannelBuffer;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.game.net.packet.server.SM_CHAR_SELECTED;
import com.l2jserver.model.dao.CharacterDAO;
import com.l2jserver.model.world.L2Character;
/**

2
src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java
View File

@@ -21,10 +21,10 @@ import java.util.List;
import org.jboss.netty.buffer.ChannelBuffer;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.game.net.packet.server.SM_CHAR_LIST;
import com.l2jserver.model.dao.CharacterDAO;
import com.l2jserver.model.world.L2Character;
/**

2
src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java
View File

@@ -19,11 +19,11 @@ package com.l2jserver.game.net.packet.client;
import org.jboss.netty.buffer.ChannelBuffer;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.game.net.packet.server.SM_CHAR_LIST;
import com.l2jserver.game.net.packet.server.SM_CHAR_RESTART;
import com.l2jserver.model.dao.CharacterDAO;
import com.l2jserver.service.game.character.CharacterService;
import com.l2jserver.service.game.spawn.NotSpawnedServiceException;

26
src/dao/com/l2jserver/db/H2DAOModule.java → src/main/java/com/l2jserver/model/H2DAOModule.java
View File

@@ -14,23 +14,23 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db;
package com.l2jserver.model;
import com.google.inject.AbstractModule;
import com.google.inject.Module;
import com.google.inject.Scopes;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.db.dao.CharacterFriendDAO;
import com.l2jserver.db.dao.ChatMessageDAO;
import com.l2jserver.db.dao.ClanDAO;
import com.l2jserver.db.dao.ItemDAO;
import com.l2jserver.db.dao.NPCDAO;
import com.l2jserver.db.dao.jdbc.h2.H2CharacterDAO;
import com.l2jserver.db.dao.jdbc.h2.H2CharacterFriendDAO;
import com.l2jserver.db.dao.jdbc.h2.H2ChatMessageDAO;
import com.l2jserver.db.dao.jdbc.h2.H2ClanDAO;
import com.l2jserver.db.dao.jdbc.h2.H2ItemDAO;
import com.l2jserver.db.dao.jdbc.h2.H2NPCDAO;
import com.l2jserver.model.dao.CharacterDAO;
import com.l2jserver.model.dao.CharacterFriendDAO;
import com.l2jserver.model.dao.ChatMessageDAO;
import com.l2jserver.model.dao.ClanDAO;
import com.l2jserver.model.dao.ItemDAO;
import com.l2jserver.model.dao.NPCDAO;
import com.l2jserver.model.dao.jdbc.h2.H2CharacterDAO;
import com.l2jserver.model.dao.jdbc.h2.H2CharacterFriendDAO;
import com.l2jserver.model.dao.jdbc.h2.H2ChatMessageDAO;
import com.l2jserver.model.dao.jdbc.h2.H2ClanDAO;
import com.l2jserver.model.dao.jdbc.h2.H2ItemDAO;
import com.l2jserver.model.dao.jdbc.h2.H2NPCDAO;
/**
* Google Guice {@link Module} for H2 DAOs

26
src/dao/com/l2jserver/db/MySQL5DAOModule.java → src/main/java/com/l2jserver/model/MySQL5DAOModule.java
View File

@@ -14,23 +14,23 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db;
package com.l2jserver.model;
import com.google.inject.AbstractModule;
import com.google.inject.Module;
import com.google.inject.Scopes;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.db.dao.CharacterFriendDAO;
import com.l2jserver.db.dao.ChatMessageDAO;
import com.l2jserver.db.dao.ClanDAO;
import com.l2jserver.db.dao.ItemDAO;
import com.l2jserver.db.dao.NPCDAO;
import com.l2jserver.db.dao.jdbc.mysql5.MySQL5CharacterDAO;
import com.l2jserver.db.dao.jdbc.mysql5.MySQL5CharacterFriendDAO;
import com.l2jserver.db.dao.jdbc.mysql5.MySQL5ChatMessageDAO;
import com.l2jserver.db.dao.jdbc.mysql5.MySQL5ClanDAO;
import com.l2jserver.db.dao.jdbc.mysql5.MySQL5ItemDAO;
import com.l2jserver.db.dao.jdbc.mysql5.MySQL5NPCDAO;
import com.l2jserver.model.dao.CharacterDAO;
import com.l2jserver.model.dao.CharacterFriendDAO;
import com.l2jserver.model.dao.ChatMessageDAO;
import com.l2jserver.model.dao.ClanDAO;
import com.l2jserver.model.dao.ItemDAO;
import com.l2jserver.model.dao.NPCDAO;
import com.l2jserver.model.dao.jdbc.mysql5.MySQL5CharacterDAO;
import com.l2jserver.model.dao.jdbc.mysql5.MySQL5CharacterFriendDAO;
import com.l2jserver.model.dao.jdbc.mysql5.MySQL5ChatMessageDAO;
import com.l2jserver.model.dao.jdbc.mysql5.MySQL5ClanDAO;
import com.l2jserver.model.dao.jdbc.mysql5.MySQL5ItemDAO;
import com.l2jserver.model.dao.jdbc.mysql5.MySQL5NPCDAO;
/**
* Google Guice {@link Module} for MySQL5 DAOs

2
src/dao/com/l2jserver/db/dao/CharacterDAO.java → src/main/java/com/l2jserver/model/dao/CharacterDAO.java
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao;
package com.l2jserver.model.dao;
import java.util.List;

2
src/dao/com/l2jserver/db/dao/CharacterFriendDAO.java → src/main/java/com/l2jserver/model/dao/CharacterFriendDAO.java
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao;
package com.l2jserver.model.dao;
import com.l2jserver.model.game.CharacterFriend;
import com.l2jserver.model.id.FriendID;

2
src/dao/com/l2jserver/db/dao/ChatMessageDAO.java → src/main/java/com/l2jserver/model/dao/ChatMessageDAO.java
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao;
package com.l2jserver.model.dao;
import com.l2jserver.model.id.ChatMessageID;
import com.l2jserver.model.server.ChatMessage;

2
src/dao/com/l2jserver/db/dao/ClanDAO.java → src/main/java/com/l2jserver/model/dao/ClanDAO.java
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao;
package com.l2jserver.model.dao;
import com.l2jserver.model.id.object.ClanID;
import com.l2jserver.model.world.Clan;

2
src/dao/com/l2jserver/db/dao/ItemDAO.java → src/main/java/com/l2jserver/model/dao/ItemDAO.java
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao;
package com.l2jserver.model.dao;
import com.l2jserver.model.id.object.ItemID;
import com.l2jserver.model.world.Item;

2
src/dao/com/l2jserver/db/dao/NPCDAO.java → src/main/java/com/l2jserver/model/dao/NPCDAO.java
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao;
package com.l2jserver.model.dao;
import java.util.Collection;
import java.util.List;

2
src/dao/com/l2jserver/db/dao/PetDAO.java → src/main/java/com/l2jserver/model/dao/PetDAO.java
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao;
package com.l2jserver.model.dao;
import com.l2jserver.model.id.object.PetID;
import com.l2jserver.model.world.Pet;

2
src/dao/com/l2jserver/db/dao/jdbc/AbstractJDBCDAO.java → src/main/java/com/l2jserver/model/dao/jdbc/AbstractJDBCDAO.java
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.jdbc;
package com.l2jserver.model.dao.jdbc;
import com.google.inject.Inject;
import com.l2jserver.model.Model;

4
src/dao/com/l2jserver/db/dao/jdbc/JDBCCharacterDAO.java → src/main/java/com/l2jserver/model/dao/jdbc/JDBCCharacterDAO.java
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.jdbc;
package com.l2jserver.model.dao.jdbc;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -23,7 +23,7 @@ import java.sql.Types;
import java.util.List;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.model.dao.CharacterDAO;
import com.l2jserver.model.id.AccountID;
import com.l2jserver.model.id.object.CharacterID;
import com.l2jserver.model.id.object.ClanID;

4
src/dao/com/l2jserver/db/dao/jdbc/JDBCCharacterFriendDAO.java → src/main/java/com/l2jserver/model/dao/jdbc/JDBCCharacterFriendDAO.java
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.jdbc;
package com.l2jserver.model.dao.jdbc;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -22,7 +22,7 @@ import java.sql.SQLException;
import java.util.List;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterFriendDAO;
import com.l2jserver.model.dao.CharacterFriendDAO;
import com.l2jserver.model.game.CharacterFriend;
import com.l2jserver.model.id.FriendID;
import com.l2jserver.model.id.object.CharacterID;

6
src/dao/com/l2jserver/db/dao/jdbc/JDBCChatMessageDAO.java → src/main/java/com/l2jserver/model/dao/jdbc/JDBCChatMessageDAO.java
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.jdbc;
package com.l2jserver.model.dao.jdbc;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -24,8 +24,8 @@ import java.util.Date;
import java.util.List;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.db.dao.ChatMessageDAO;
import com.l2jserver.model.dao.CharacterDAO;
import com.l2jserver.model.dao.ChatMessageDAO;
import com.l2jserver.model.id.ChatMessageID;
import com.l2jserver.model.id.object.CharacterID;
import com.l2jserver.model.id.object.provider.CharacterIDProvider;

6
src/dao/com/l2jserver/db/dao/jdbc/JDBCClanDAO.java → src/main/java/com/l2jserver/model/dao/jdbc/JDBCClanDAO.java
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.jdbc;
package com.l2jserver.model.dao.jdbc;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -22,8 +22,8 @@ import java.sql.SQLException;
import java.util.List;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.db.dao.ClanDAO;
import com.l2jserver.model.dao.CharacterDAO;
import com.l2jserver.model.dao.ClanDAO;
import com.l2jserver.model.id.object.CharacterID;
import com.l2jserver.model.id.object.ClanID;
import com.l2jserver.model.id.object.provider.CharacterIDProvider;

4
src/dao/com/l2jserver/db/dao/jdbc/JDBCItemDAO.java → src/main/java/com/l2jserver/model/dao/jdbc/JDBCItemDAO.java
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.jdbc;
package com.l2jserver.model.dao.jdbc;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -22,7 +22,7 @@ import java.sql.SQLException;
import java.util.List;
import com.google.inject.Inject;
import com.l2jserver.db.dao.ItemDAO;
import com.l2jserver.model.dao.ItemDAO;
import com.l2jserver.model.id.object.CharacterID;
import com.l2jserver.model.id.object.ItemID;
import com.l2jserver.model.id.object.provider.CharacterIDProvider;

6
src/dao/com/l2jserver/db/dao/jdbc/JDBCNPCDAO.java → src/main/java/com/l2jserver/model/dao/jdbc/JDBCNPCDAO.java
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.jdbc;
package com.l2jserver.model.dao.jdbc;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -25,8 +25,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.db.dao.NPCDAO;
import com.l2jserver.model.dao.CharacterDAO;
import com.l2jserver.model.dao.NPCDAO;
import com.l2jserver.model.id.object.NPCID;
import com.l2jserver.model.id.object.provider.NPCIDProvider;
import com.l2jserver.model.id.template.NPCTemplateID;

6
src/dao/com/l2jserver/db/dao/jdbc/h2/H2CharacterDAO.java → src/main/java/com/l2jserver/model/dao/jdbc/h2/H2CharacterDAO.java
View File

@@ -14,11 +14,11 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.jdbc.h2;
package com.l2jserver.model.dao.jdbc.h2;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.db.dao.jdbc.JDBCCharacterDAO;
import com.l2jserver.model.dao.CharacterDAO;
import com.l2jserver.model.dao.jdbc.JDBCCharacterDAO;
import com.l2jserver.model.id.object.provider.CharacterIDProvider;
import com.l2jserver.model.id.object.provider.ClanIDProvider;
import com.l2jserver.model.id.provider.AccountIDProvider;

6
src/dao/com/l2jserver/db/dao/jdbc/h2/H2CharacterFriendDAO.java → src/main/java/com/l2jserver/model/dao/jdbc/h2/H2CharacterFriendDAO.java
View File

@@ -14,11 +14,11 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.jdbc.h2;
package com.l2jserver.model.dao.jdbc.h2;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterFriendDAO;
import com.l2jserver.db.dao.jdbc.JDBCCharacterFriendDAO;
import com.l2jserver.model.dao.CharacterFriendDAO;
import com.l2jserver.model.dao.jdbc.JDBCCharacterFriendDAO;
import com.l2jserver.model.id.object.provider.CharacterIDProvider;
import com.l2jserver.model.id.provider.FriendIDProvider;
import com.l2jserver.service.database.DatabaseService;

6
src/dao/com/l2jserver/db/dao/jdbc/h2/H2ChatMessageDAO.java → src/main/java/com/l2jserver/model/dao/jdbc/h2/H2ChatMessageDAO.java
View File

@@ -14,11 +14,11 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.jdbc.h2;
package com.l2jserver.model.dao.jdbc.h2;
import com.google.inject.Inject;
import com.l2jserver.db.dao.ChatMessageDAO;
import com.l2jserver.db.dao.jdbc.JDBCChatMessageDAO;
import com.l2jserver.model.dao.ChatMessageDAO;
import com.l2jserver.model.dao.jdbc.JDBCChatMessageDAO;
import com.l2jserver.model.id.object.provider.CharacterIDProvider;
import com.l2jserver.model.id.provider.ChatMessageIDProvider;
import com.l2jserver.service.database.DatabaseService;

8
src/dao/com/l2jserver/db/dao/jdbc/h2/H2ClanDAO.java → src/main/java/com/l2jserver/model/dao/jdbc/h2/H2ClanDAO.java
View File

@@ -14,12 +14,12 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.jdbc.h2;
package com.l2jserver.model.dao.jdbc.h2;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.db.dao.ClanDAO;
import com.l2jserver.db.dao.jdbc.JDBCClanDAO;
import com.l2jserver.model.dao.CharacterDAO;
import com.l2jserver.model.dao.ClanDAO;
import com.l2jserver.model.dao.jdbc.JDBCClanDAO;
import com.l2jserver.model.id.object.provider.CharacterIDProvider;
import com.l2jserver.model.id.object.provider.ClanIDProvider;
import com.l2jserver.service.database.DatabaseService;

6
src/dao/com/l2jserver/db/dao/jdbc/h2/H2ItemDAO.java → src/main/java/com/l2jserver/model/dao/jdbc/h2/H2ItemDAO.java
View File

@@ -14,11 +14,11 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.jdbc.h2;
package com.l2jserver.model.dao.jdbc.h2;
import com.google.inject.Inject;
import com.l2jserver.db.dao.ItemDAO;
import com.l2jserver.db.dao.jdbc.JDBCItemDAO;
import com.l2jserver.model.dao.ItemDAO;
import com.l2jserver.model.dao.jdbc.JDBCItemDAO;
import com.l2jserver.model.id.object.provider.CharacterIDProvider;
import com.l2jserver.model.id.object.provider.ItemIDProvider;
import com.l2jserver.model.id.template.provider.ItemTemplateIDProvider;

8
src/dao/com/l2jserver/db/dao/jdbc/h2/H2NPCDAO.java → src/main/java/com/l2jserver/model/dao/jdbc/h2/H2NPCDAO.java
View File

@@ -14,12 +14,12 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.jdbc.h2;
package com.l2jserver.model.dao.jdbc.h2;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.db.dao.NPCDAO;
import com.l2jserver.db.dao.jdbc.JDBCNPCDAO;
import com.l2jserver.model.dao.CharacterDAO;
import com.l2jserver.model.dao.NPCDAO;
import com.l2jserver.model.dao.jdbc.JDBCNPCDAO;
import com.l2jserver.model.id.object.provider.NPCIDProvider;
import com.l2jserver.model.id.template.provider.NPCTemplateIDProvider;
import com.l2jserver.service.database.DatabaseService;

6
src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5CharacterDAO.java → src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5CharacterDAO.java
View File

@@ -14,11 +14,11 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.jdbc.mysql5;
package com.l2jserver.model.dao.jdbc.mysql5;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.db.dao.jdbc.JDBCCharacterDAO;
import com.l2jserver.model.dao.CharacterDAO;
import com.l2jserver.model.dao.jdbc.JDBCCharacterDAO;
import com.l2jserver.model.id.object.provider.CharacterIDProvider;
import com.l2jserver.model.id.object.provider.ClanIDProvider;
import com.l2jserver.model.id.provider.AccountIDProvider;

6
src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5CharacterFriendDAO.java → src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5CharacterFriendDAO.java
View File

@@ -14,11 +14,11 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.jdbc.mysql5;
package com.l2jserver.model.dao.jdbc.mysql5;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterFriendDAO;
import com.l2jserver.db.dao.jdbc.JDBCCharacterFriendDAO;
import com.l2jserver.model.dao.CharacterFriendDAO;
import com.l2jserver.model.dao.jdbc.JDBCCharacterFriendDAO;
import com.l2jserver.model.id.object.provider.CharacterIDProvider;
import com.l2jserver.model.id.provider.FriendIDProvider;
import com.l2jserver.service.database.DatabaseService;

6
src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5ChatMessageDAO.java → src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5ChatMessageDAO.java
View File

@@ -14,11 +14,11 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.jdbc.mysql5;
package com.l2jserver.model.dao.jdbc.mysql5;
import com.google.inject.Inject;
import com.l2jserver.db.dao.ChatMessageDAO;
import com.l2jserver.db.dao.jdbc.JDBCChatMessageDAO;
import com.l2jserver.model.dao.ChatMessageDAO;
import com.l2jserver.model.dao.jdbc.JDBCChatMessageDAO;
import com.l2jserver.model.id.object.provider.CharacterIDProvider;
import com.l2jserver.model.id.provider.ChatMessageIDProvider;
import com.l2jserver.service.database.DatabaseService;

8
src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5ClanDAO.java → src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5ClanDAO.java
View File

@@ -14,12 +14,12 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.jdbc.mysql5;
package com.l2jserver.model.dao.jdbc.mysql5;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.db.dao.ClanDAO;
import com.l2jserver.db.dao.jdbc.JDBCClanDAO;
import com.l2jserver.model.dao.CharacterDAO;
import com.l2jserver.model.dao.ClanDAO;
import com.l2jserver.model.dao.jdbc.JDBCClanDAO;
import com.l2jserver.model.id.object.provider.CharacterIDProvider;
import com.l2jserver.model.id.object.provider.ClanIDProvider;
import com.l2jserver.service.database.DatabaseService;

6
src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5ItemDAO.java → src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5ItemDAO.java
View File

@@ -14,11 +14,11 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.jdbc.mysql5;
package com.l2jserver.model.dao.jdbc.mysql5;
import com.google.inject.Inject;
import com.l2jserver.db.dao.ItemDAO;
import com.l2jserver.db.dao.jdbc.JDBCItemDAO;
import com.l2jserver.model.dao.ItemDAO;
import com.l2jserver.model.dao.jdbc.JDBCItemDAO;
import com.l2jserver.model.id.object.provider.CharacterIDProvider;
import com.l2jserver.model.id.object.provider.ItemIDProvider;
import com.l2jserver.model.id.template.provider.ItemTemplateIDProvider;

8
src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5NPCDAO.java → src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5NPCDAO.java
View File

@@ -14,12 +14,12 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.jdbc.mysql5;
package com.l2jserver.model.dao.jdbc.mysql5;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.db.dao.NPCDAO;
import com.l2jserver.db.dao.jdbc.JDBCNPCDAO;
import com.l2jserver.model.dao.CharacterDAO;
import com.l2jserver.model.dao.NPCDAO;
import com.l2jserver.model.dao.jdbc.JDBCNPCDAO;
import com.l2jserver.model.id.object.provider.NPCIDProvider;
import com.l2jserver.model.id.template.provider.NPCTemplateIDProvider;
import com.l2jserver.service.database.DatabaseService;

2
src/main/java/com/l2jserver/model/id/object/CharacterID.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.model.id.object;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.model.dao.CharacterDAO;
import com.l2jserver.model.id.ObjectID;
import com.l2jserver.model.id.provider.IDProvider;
import com.l2jserver.model.world.L2Character;

2
src/main/java/com/l2jserver/model/id/object/ClanID.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.model.id.object;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
import com.l2jserver.db.dao.ClanDAO;
import com.l2jserver.model.dao.ClanDAO;
import com.l2jserver.model.id.ObjectID;
import com.l2jserver.model.id.provider.IDProvider;
import com.l2jserver.model.world.Clan;

2
src/main/java/com/l2jserver/model/id/object/ItemID.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.model.id.object;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
import com.l2jserver.db.dao.ItemDAO;
import com.l2jserver.model.dao.ItemDAO;
import com.l2jserver.model.id.ObjectID;
import com.l2jserver.model.id.provider.IDProvider;
import com.l2jserver.model.world.Item;

2
src/main/java/com/l2jserver/model/id/object/PetID.java
View File

@@ -17,7 +17,7 @@
package com.l2jserver.model.id.object;
import com.google.inject.Inject;
import com.l2jserver.db.dao.PetDAO;
import com.l2jserver.model.dao.PetDAO;
import com.l2jserver.model.id.ObjectID;
import com.l2jserver.model.id.provider.IDProvider;
import com.l2jserver.model.world.Pet;

10
src/main/java/com/l2jserver/service/database/JDBCDatabaseService.java
View File

@@ -38,13 +38,13 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.db.dao.ClanDAO;
import com.l2jserver.db.dao.ItemDAO;
import com.l2jserver.db.dao.NPCDAO;
import com.l2jserver.db.dao.PetDAO;
import com.l2jserver.model.Model;
import com.l2jserver.model.Model.ObjectDesire;
import com.l2jserver.model.dao.CharacterDAO;
import com.l2jserver.model.dao.ClanDAO;
import com.l2jserver.model.dao.ItemDAO;
import com.l2jserver.model.dao.NPCDAO;
import com.l2jserver.model.dao.PetDAO;
import com.l2jserver.model.id.ID;
import com.l2jserver.model.id.object.allocator.IDAllocator;
import com.l2jserver.model.world.Clan;

2
src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java
View File

@@ -18,7 +18,6 @@ package com.l2jserver.service.game.character;
import com.google.common.base.Preconditions;
import com.google.inject.Inject;
import com.l2jserver.db.dao.ItemDAO;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.SystemMessage;
import com.l2jserver.game.net.packet.server.SM_CHAR_INFO;
@@ -29,6 +28,7 @@ import com.l2jserver.game.net.packet.server.SM_ITEM_GROUND;
import com.l2jserver.game.net.packet.server.SM_MOVE;
import com.l2jserver.game.net.packet.server.SM_MOVE_TYPE;
import com.l2jserver.game.net.packet.server.SM_TARGET;
import com.l2jserver.model.dao.ItemDAO;
import com.l2jserver.model.id.object.CharacterID;
import com.l2jserver.model.server.ChatMessage;
import com.l2jserver.model.world.Actor;

2
src/main/java/com/l2jserver/service/game/chat/DatabaseChatLoggingService.java
View File

@@ -19,7 +19,7 @@ package com.l2jserver.service.game.chat;
import java.util.Date;
import com.google.inject.Inject;
import com.l2jserver.db.dao.ChatMessageDAO;
import com.l2jserver.model.dao.ChatMessageDAO;
import com.l2jserver.model.id.object.CharacterID;
import com.l2jserver.model.id.object.provider.CharacterIDProvider;
import com.l2jserver.model.server.ChatMessage;

2
src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java
View File

@@ -21,7 +21,7 @@ import java.util.Set;
import com.google.common.base.Preconditions;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.model.dao.CharacterDAO;
import com.l2jserver.model.id.object.CharacterID;
import com.l2jserver.model.id.object.ClanID;
import com.l2jserver.model.server.ChatMessage;

2
src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java
View File

@@ -24,9 +24,9 @@ import java.util.concurrent.TimeUnit;
import com.google.common.base.Preconditions;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.l2jserver.db.dao.NPCDAO;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.client.CM_CHAR_ACTION.CharacterAction;
import com.l2jserver.model.dao.NPCDAO;
import com.l2jserver.model.template.NPCTemplate;
import com.l2jserver.model.world.Actor;
import com.l2jserver.model.world.Actor.ActorState;

6
src/main/java/com/l2jserver/service/game/world/CachedWorldIDService.java
View File

@@ -20,9 +20,9 @@ import java.util.Collection;
import com.google.common.base.Preconditions;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.db.dao.ItemDAO;
import com.l2jserver.db.dao.NPCDAO;
import com.l2jserver.model.dao.CharacterDAO;
import com.l2jserver.model.dao.ItemDAO;
import com.l2jserver.model.dao.NPCDAO;
import com.l2jserver.model.id.ID;
import com.l2jserver.model.id.ObjectID;
import com.l2jserver.model.id.object.allocator.IDAllocator;

2
src/test/java/com/l2jserver/db/dao/mysql5/MySQL5CharacterDAOTest.java
View File

@@ -24,7 +24,7 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Stage;
import com.l2jserver.GameServerModule;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.model.dao.CharacterDAO;
import com.l2jserver.model.id.object.provider.CharacterIDProvider;
import com.l2jserver.model.world.L2Character;
import com.l2jserver.service.ServiceManager;

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

@@ -23,7 +23,7 @@ import org.junit.Test;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.l2jserver.db.H2DAOModule;
import com.l2jserver.model.H2DAOModule;
import com.l2jserver.model.id.ID;
import com.l2jserver.model.id.object.CharacterID;
import com.l2jserver.model.id.object.provider.CharacterIDProvider;

2
src/test/java/com/l2jserver/service/game/template/StaticTemplateServiceTest.java
View File

@@ -20,7 +20,7 @@ import org.junit.Test;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.l2jserver.db.H2DAOModule;
import com.l2jserver.model.H2DAOModule;
import com.l2jserver.model.id.provider.IDProviderModule;
import com.l2jserver.model.id.template.provider.ItemTemplateIDProvider;
import com.l2jserver.service.ServiceManager;