removed redundant modifiers from interfaces

This commit is contained in:
North 2012-12-20 23:45:22 +02:00
parent 18b4be3ec7
commit fde10788db
53 changed files with 762 additions and 755 deletions

View file

@ -36,6 +36,7 @@ import java.util.UUID;
* @author BetaSteward_at_googlemail.com
*/
public interface Room extends Remote {
public UUID getChatId();
public UUID getRoomId();
UUID getChatId();
UUID getRoomId();
}

View file

@ -36,6 +36,5 @@ import mage.MageException;
*/
public interface GameCallback {
public void gameResult(String result) throws MageException;
void gameResult(String result) throws MageException;
}

View file

@ -638,6 +638,6 @@ public class GameController implements GameCallback {
}
interface Command {
public void execute(UUID player);
void execute(UUID player);
}
}

View file

@ -45,17 +45,17 @@ import mage.view.TableView;
*/
public interface GamesRoom extends Room {
public List<TableView> getTables();
public List<MatchView> getFinished();
public List<String> getPlayers();
public boolean joinTable(UUID userId, UUID tableId, String name, String playerType, int skill, DeckCardLists deckList) throws MageException;
public boolean joinTournamentTable(UUID userId, UUID tableId, String name, String playerType, int skill) throws GameException;
public TableView createTable(UUID userId, MatchOptions options);
public TableView createTournamentTable(UUID userId, TournamentOptions options);
public void removeTable(UUID userId, UUID tableId);
public void removeTable(UUID tableId);
public TableView getTable(UUID tableId);
public void leaveTable(UUID userId, UUID tableId);
public boolean watchTable(UUID userId, UUID tableId) throws MageException;
List<TableView> getTables();
List<MatchView> getFinished();
List<String> getPlayers();
boolean joinTable(UUID userId, UUID tableId, String name, String playerType, int skill, DeckCardLists deckList) throws MageException;
boolean joinTournamentTable(UUID userId, UUID tableId, String name, String playerType, int skill) throws GameException;
TableView createTable(UUID userId, MatchOptions options);
TableView createTournamentTable(UUID userId, TournamentOptions options);
void removeTable(UUID userId, UUID tableId);
void removeTable(UUID tableId);
TableView getTable(UUID tableId);
void leaveTable(UUID userId, UUID tableId);
boolean watchTable(UUID userId, UUID tableId) throws MageException;
}

View file

@ -5,29 +5,29 @@ package mage.server.services;
*/
public interface LogKeys {
public static final String KEY_GAME_STARTED = "gameStarted";
String KEY_GAME_STARTED = "gameStarted";
public static final String KEY_USER_CONNECTED = "userConnected";
String KEY_USER_CONNECTED = "userConnected";
public static final String KEY_ADMIN_CONNECTED = "adminConnected";
String KEY_ADMIN_CONNECTED = "adminConnected";
public static final String KEY_SESSION_KILLED = "sessionKilled";
String KEY_SESSION_KILLED = "sessionKilled";
public static final String KEY_SESSION_DISCONNECTED = "sessionDisconnected";
String KEY_SESSION_DISCONNECTED = "sessionDisconnected";
public static final String KEY_SESSION_DISCONNECTED_BY_ADMIN = "sessionDisconnectedByAdmin";
String KEY_SESSION_DISCONNECTED_BY_ADMIN = "sessionDisconnectedByAdmin";
public static final String KEY_NOT_VALID_SESSION = "sessionNotValid";
String KEY_NOT_VALID_SESSION = "sessionNotValid";
public static final String KEY_NOT_VALID_SESSION_INTERNAL = "sessionNotValidInternal";
String KEY_NOT_VALID_SESSION_INTERNAL = "sessionNotValidInternal";
public static final String KEY_TABLE_CREATED = "tableCreated";
String KEY_TABLE_CREATED = "tableCreated";
public static final String KEY_TOURNAMENT_TABLE_CREATED = "tournamentTableCreated";
String KEY_TOURNAMENT_TABLE_CREATED = "tournamentTableCreated";
public static final String KEY_WRONG_VERSION = "wrongVersion";
String KEY_WRONG_VERSION = "wrongVersion";
public static final String KEY_NOT_ADMIN = "notAdminRestrictedOperation";
String KEY_NOT_ADMIN = "notAdminRestrictedOperation";
public static final String KEY_FEEDBACK_ADDED = "feedbackAdded";
String KEY_FEEDBACK_ADDED = "feedbackAdded";
}