Menu
▾
▴
[Arianne-commits] marauroa/src/marauroa/server/game RPServerManager.java, 1.39, 1.40 JDBCPlayerDatabase.java, 1.26, 1.27 JDBCTransaction.java, 1.7, 1.8 PlayerEntryContainer.java, 1.13, 1.14 MarauroaRPZone.java, 1.13, 1.14 GameServerManager.java, 1.26, 1.27
|
From: Hendrik B. <nh...@us...> - 2006-08-26 20:00:36
|
Update of /cvsroot/arianne/marauroa/src/marauroa/server/game In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv32149/src/marauroa/server/game Modified Files: RPServerManager.java JDBCPlayerDatabase.java JDBCTransaction.java PlayerEntryContainer.java MarauroaRPZone.java GameServerManager.java Log Message: code cleanup: @Override, removed unnecessary casts and added {}-blocks to all solo conditions Index: PlayerEntryContainer.java =================================================================== RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/game/PlayerEntryContainer.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** PlayerEntryContainer.java 20 Aug 2006 15:40:15 -0000 1.13 --- PlayerEntryContainer.java 26 Aug 2006 20:00:31 -0000 1.14 *************** *** 155,158 **** --- 155,159 ---- } + @Override public String toString() { StringBuffer st = new StringBuffer("PlayerEntry("); *************** *** 369,373 **** try { if (hasRuntimePlayer(clientid)) { ! RuntimePlayerEntry entry = (RuntimePlayerEntry) listPlayerEntries .get(new Integer(clientid)); --- 370,374 ---- try { if (hasRuntimePlayer(clientid)) { ! RuntimePlayerEntry entry = listPlayerEntries .get(new Integer(clientid)); *************** *** 462,466 **** if (hasRuntimePlayer(clientid)) { try { ! RuntimePlayerEntry entry = (RuntimePlayerEntry) listPlayerEntries .get(new Integer(clientid)); --- 463,467 ---- if (hasRuntimePlayer(clientid)) { try { ! RuntimePlayerEntry entry = listPlayerEntries .get(new Integer(clientid)); *************** *** 589,593 **** if (hasRuntimePlayer(clientid)) { try { ! RuntimePlayerEntry entry = (RuntimePlayerEntry) listPlayerEntries .get(new Integer(clientid)); --- 590,594 ---- if (hasRuntimePlayer(clientid)) { try { ! RuntimePlayerEntry entry = listPlayerEntries .get(new Integer(clientid)); *************** *** 629,633 **** try { if (hasRuntimePlayer(clientid)) { ! RuntimePlayerEntry entry = (RuntimePlayerEntry) listPlayerEntries .get(new Integer(clientid)); --- 630,634 ---- try { if (hasRuntimePlayer(clientid)) { ! RuntimePlayerEntry entry = listPlayerEntries .get(new Integer(clientid)); *************** *** 662,666 **** if (hasRuntimePlayer(clientid)) { try { ! RuntimePlayerEntry entry = (RuntimePlayerEntry) listPlayerEntries .get(new Integer(clientid)); --- 663,667 ---- if (hasRuntimePlayer(clientid)) { try { ! RuntimePlayerEntry entry = listPlayerEntries .get(new Integer(clientid)); *************** *** 710,714 **** try { if (hasRuntimePlayer(clientid)) { ! RuntimePlayerEntry entry = (RuntimePlayerEntry) listPlayerEntries .get(new Integer(clientid)); RPObject object = playerDatabase.getRPObject(transaction, --- 711,715 ---- try { if (hasRuntimePlayer(clientid)) { ! RuntimePlayerEntry entry = listPlayerEntries .get(new Integer(clientid)); RPObject object = playerDatabase.getRPObject(transaction, *************** *** 766,770 **** try { if (hasRuntimePlayer(clientid)) { ! RuntimePlayerEntry entry = (RuntimePlayerEntry) listPlayerEntries .get(new Integer(clientid)); --- 767,771 ---- try { if (hasRuntimePlayer(clientid)) { ! RuntimePlayerEntry entry = listPlayerEntries .get(new Integer(clientid)); *************** *** 834,838 **** try { if (hasRuntimePlayer(clientid)) { ! return (RuntimePlayerEntry) listPlayerEntries.get(new Integer( clientid)); } else { --- 835,839 ---- try { if (hasRuntimePlayer(clientid)) { ! return listPlayerEntries.get(new Integer( clientid)); } else { *************** *** 860,864 **** try { if (hasRuntimePlayer(clientid)) { ! RuntimePlayerEntry entry = (RuntimePlayerEntry) listPlayerEntries .get(new Integer(clientid)); --- 861,865 ---- try { if (hasRuntimePlayer(clientid)) { ! RuntimePlayerEntry entry = listPlayerEntries .get(new Integer(clientid)); *************** *** 889,893 **** try { if (hasRuntimePlayer(clientid)) { ! RuntimePlayerEntry entry = (RuntimePlayerEntry) listPlayerEntries .get(new Integer(clientid)); ClientState oldState = entry.state; --- 890,894 ---- try { if (hasRuntimePlayer(clientid)) { ! RuntimePlayerEntry entry = listPlayerEntries .get(new Integer(clientid)); ClientState oldState = entry.state; *************** *** 924,928 **** try { if (hasRuntimePlayer(clientid)) { ! RuntimePlayerEntry entry = (RuntimePlayerEntry) listPlayerEntries .get(new Integer(clientid)); --- 925,929 ---- try { if (hasRuntimePlayer(clientid)) { ! RuntimePlayerEntry entry = listPlayerEntries .get(new Integer(clientid)); *************** *** 959,963 **** try { if (hasRuntimePlayer(clientid)) { ! RuntimePlayerEntry entry = (RuntimePlayerEntry) listPlayerEntries .get(new Integer(clientid)); --- 960,964 ---- try { if (hasRuntimePlayer(clientid)) { ! RuntimePlayerEntry entry = listPlayerEntries .get(new Integer(clientid)); *************** *** 985,989 **** try { if (hasRuntimePlayer(clientid)) { ! RuntimePlayerEntry entry = (RuntimePlayerEntry) listPlayerEntries .get(new Integer(clientid)); --- 986,990 ---- try { if (hasRuntimePlayer(clientid)) { ! RuntimePlayerEntry entry = listPlayerEntries .get(new Integer(clientid)); *************** *** 1011,1015 **** try { if (hasRuntimePlayer(clientid)) { ! RuntimePlayerEntry entry = (RuntimePlayerEntry) listPlayerEntries .get(new Integer(clientid)); --- 1012,1016 ---- try { if (hasRuntimePlayer(clientid)) { ! RuntimePlayerEntry entry = listPlayerEntries .get(new Integer(clientid)); Index: GameServerManager.java =================================================================== RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/game/GameServerManager.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** GameServerManager.java 20 Aug 2006 15:40:16 -0000 1.26 --- GameServerManager.java 26 Aug 2006 20:00:31 -0000 1.27 *************** *** 131,134 **** --- 131,135 ---- } + @Override public void run() { Log4J.startMethod(logger, "run"); *************** *** 247,252 **** // verify event if (!isValidEvent(msg, ! PlayerEntryContainer.ClientState.LOGIN_COMPLETE)) return; if (playerContainer.hasCharacter(clientid, msg.getCharacter())) { --- 248,254 ---- // verify event if (!isValidEvent(msg, ! PlayerEntryContainer.ClientState.LOGIN_COMPLETE)) { return; + } if (playerContainer.hasCharacter(clientid, msg.getCharacter())) { *************** *** 365,370 **** // verify event ! if (!isValidEvent(msg, PlayerEntryContainer.ClientState.GAME_BEGIN)) return; /* Send the action to RP Manager */ --- 367,373 ---- // verify event ! if (!isValidEvent(msg, PlayerEntryContainer.ClientState.GAME_BEGIN)) { return; + } /* Send the action to RP Manager */ *************** *** 412,417 **** // verify event ! if (!isValidEvent(msg, PlayerEntryContainer.ClientState.GAME_BEGIN)) return; /** TODO: Compute client lag here */ --- 415,421 ---- // verify event ! if (!isValidEvent(msg, PlayerEntryContainer.ClientState.GAME_BEGIN)) { return; + } /** TODO: Compute client lag here */ *************** *** 526,531 **** // verify event ! if (!isValidEvent(msg, PlayerEntryContainer.ClientState.NULL)) return; int clientid = msg.getClientID(); --- 530,536 ---- // verify event ! if (!isValidEvent(msg, PlayerEntryContainer.ClientState.NULL)) { return; + } int clientid = msg.getClientID(); *************** *** 623,628 **** // verify event ! if (!isValidEvent(msg, PlayerEntryContainer.ClientState.GAME_BEGIN)) return; /** Notify PlayerEntryContainer that this player is out of Sync */ --- 628,634 ---- // verify event ! if (!isValidEvent(msg, PlayerEntryContainer.ClientState.GAME_BEGIN)) { return; + } /** Notify PlayerEntryContainer that this player is out of Sync */ *************** *** 643,648 **** // verify event ! if (!isValidEvent(msg, PlayerEntryContainer.ClientState.GAME_BEGIN)) return; /** Handle Transfer ACK here */ --- 649,655 ---- // verify event ! if (!isValidEvent(msg, PlayerEntryContainer.ClientState.GAME_BEGIN)) { return; + } /** Handle Transfer ACK here */ *************** *** 715,719 **** } String[] result = new String[l_result.size()]; ! return (String[]) l_result.toArray(result); } } --- 722,726 ---- } String[] result = new String[l_result.size()]; ! return l_result.toArray(result); } } Index: MarauroaRPZone.java =================================================================== RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/game/MarauroaRPZone.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** MarauroaRPZone.java 20 Aug 2006 15:40:16 -0000 1.13 --- MarauroaRPZone.java 26 Aug 2006 20:00:31 -0000 1.14 *************** *** 105,109 **** public RPObject remove(RPObject.ID id) throws RPObjectNotFoundException { if (objects.containsKey(id)) { ! RPObject object = (RPObject) objects.remove(id); // If objects has been removed, remove from modified --- 105,109 ---- public RPObject remove(RPObject.ID id) throws RPObjectNotFoundException { if (objects.containsKey(id)) { ! RPObject object = objects.remove(id); // If objects has been removed, remove from modified *************** *** 120,124 **** public RPObject get(RPObject.ID id) throws RPObjectNotFoundException { if (objects.containsKey(id)) { ! RPObject object = (RPObject) objects.get(id); return object; } --- 120,124 ---- public RPObject get(RPObject.ID id) throws RPObjectNotFoundException { if (objects.containsKey(id)) { ! RPObject object = objects.get(id); return object; } Index: JDBCTransaction.java =================================================================== RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/game/JDBCTransaction.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** JDBCTransaction.java 20 Aug 2006 15:40:15 -0000 1.7 --- JDBCTransaction.java 26 Aug 2006 20:00:31 -0000 1.8 *************** *** 52,55 **** --- 52,56 ---- } + @Override public void begin() throws TransactionException { try { *************** *** 61,64 **** --- 62,66 ---- } + @Override public void commit() throws TransactionException { try { *************** *** 70,73 **** --- 72,76 ---- } + @Override public void rollback() { try { Index: JDBCPlayerDatabase.java =================================================================== RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/game/JDBCPlayerDatabase.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** JDBCPlayerDatabase.java 20 Aug 2006 15:40:15 -0000 1.26 --- JDBCPlayerDatabase.java 26 Aug 2006 20:00:31 -0000 1.27 *************** *** 63,66 **** --- 63,67 ---- * @return a string representing the object. */ + @Override public String toString() { return "Login " + (correct ? "SUCESSFULL" : "FAILED") + " at " *************** *** 70,91 **** public boolean validString(String string) { ! if (string.indexOf('\\') != -1) return false; ! if (string.indexOf('\'') != -1) return false; ! if (string.indexOf('"') != -1) return false; ! if (string.indexOf('%') != -1) return false; ! if (string.indexOf(';') != -1) return false; ! if (string.indexOf(':') != -1) return false; ! if (string.indexOf('#') != -1) return false; ! if (string.indexOf('<') != -1) return false; ! if (string.indexOf('>') != -1) return false; return true; } --- 71,101 ---- public boolean validString(String string) { ! if (string.indexOf('\\') != -1) { return false; ! } ! if (string.indexOf('\'') != -1) { return false; ! } ! if (string.indexOf('"') != -1) { return false; ! } ! if (string.indexOf('%') != -1) { return false; ! } ! if (string.indexOf(';') != -1) { return false; ! } ! if (string.indexOf(':') != -1) { return false; ! } ! if (string.indexOf('#') != -1) { return false; ! } ! if (string.indexOf('<') != -1) { return false; ! } ! if (string.indexOf('>') != -1) { return false; + } return true; } *************** *** 225,229 **** characters = new String[vector.size()]; ! characters = (String[]) vector.toArray(characters); stmt.close(); --- 235,239 ---- characters = new String[vector.size()]; ! characters = vector.toArray(characters); stmt.close(); *************** *** 548,552 **** login_event.address = result.getString("address"); ! login_event.time = (java.util.Date) result .getTimestamp("timedate"); login_event.correct = result.getInt("result") != 0; --- 558,562 ---- login_event.address = result.getString("address"); ! login_event.time = result .getTimestamp("timedate"); login_event.correct = result.getInt("result") != 0; *************** *** 558,562 **** loginEvents = new String[vector.size()]; ! loginEvents = (String[]) vector.toArray(loginEvents); Log4J.finishMethod(logger, "getLoginEvent"); return loginEvents; --- 568,572 ---- loginEvents = new String[vector.size()]; ! loginEvents = vector.toArray(loginEvents); Log4J.finishMethod(logger, "getLoginEvent"); return loginEvents; *************** *** 1090,1093 **** --- 1100,1104 ---- } + @Override public void finalize() { try { Index: RPServerManager.java =================================================================== RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/game/RPServerManager.java,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** RPServerManager.java 23 Aug 2006 02:11:45 -0000 1.39 --- RPServerManager.java 26 Aug 2006 20:00:31 -0000 1.40 *************** *** 435,438 **** --- 435,439 ---- } + @Override public void run() { try { |