X-Git-Url: https://git.hedgecode.org/?p=chesshog-scanner.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fhedgecode%2Fchess%2Fscanner%2Fportal%2FChessGamesScanner.java;fp=src%2Fmain%2Fjava%2Forg%2Fhedgecode%2Fchess%2Fscanner%2Fportal%2FChessGamesScanner.java;h=247660a23e4051a421c489a2eef6e16636f7ca4b;hp=dfca44089d1524018ad918b42bcdaa38989eb037;hb=df574e5ec8ae08c1c50adbe30b597cd86e6ab3fa;hpb=25ccd0fd5d5a640bc2dac646f2d760b5d64b989b diff --git a/src/main/java/org/hedgecode/chess/scanner/portal/ChessGamesScanner.java b/src/main/java/org/hedgecode/chess/scanner/portal/ChessGamesScanner.java index dfca440..247660a 100644 --- a/src/main/java/org/hedgecode/chess/scanner/portal/ChessGamesScanner.java +++ b/src/main/java/org/hedgecode/chess/scanner/portal/ChessGamesScanner.java @@ -20,8 +20,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.hedgecode.chess.scanner.ChessHogScannerException; import org.hedgecode.chess.scanner.Scanner; +import org.hedgecode.chess.scanner.ScannerException; import org.hedgecode.chess.scanner.entity.PGNGame; import org.hedgecode.chess.scanner.entity.PGNTournament; @@ -40,14 +40,14 @@ public class ChessGamesScanner extends AbstractSettingsScanner implements Scanne } @Override - public PGNTournament scanTournament(String tournamentId) throws ChessHogScannerException { + public PGNTournament scanTournament(String tournamentId) throws ScannerException { PGNTournament tournament = new PGNTournament(tournamentId); assignTournamentGames(tournament); return tournament; } @Override - public PGNTournament findTournament(String tournamentName) throws ChessHogScannerException { + public PGNTournament findTournament(String tournamentName) throws ScannerException { PGNTournament tournament = null; Map result = matchMap( assignUrl( @@ -71,12 +71,12 @@ public class ChessGamesScanner extends AbstractSettingsScanner implements Scanne } @Override - public PGNGame scanGame(String gameId) throws ChessHogScannerException { + public PGNGame scanGame(String gameId) throws ScannerException { String pgn = request( assignUrl(gameId) ); if (!isPgnFormat(pgn)) { - throw new ChessHogScannerException( + throw new ScannerException( String.format("Failed to get PGN for requesting game ID: %s", gameId) ); } @@ -86,12 +86,12 @@ public class ChessGamesScanner extends AbstractSettingsScanner implements Scanne } @Override - public PGNGame scanGame(String gameId, String tournamentId) throws ChessHogScannerException { + public PGNGame scanGame(String gameId, String tournamentId) throws ScannerException { return scanGame(gameId); } @Override - public PGNGame scanUrl(String gameUrl) throws ChessHogScannerException { + public PGNGame scanUrl(String gameUrl) throws ScannerException { String pgn = regex( request( gameUrl @@ -99,7 +99,7 @@ public class ChessGamesScanner extends AbstractSettingsScanner implements Scanne getSettings().getGameUrlRegex() ); if (pgn == null || !isPgnFormat(pgn)) { - throw new ChessHogScannerException( + throw new ScannerException( String.format("Failed to get PGN for requesting URL: %s", gameUrl) ); } @@ -109,7 +109,7 @@ public class ChessGamesScanner extends AbstractSettingsScanner implements Scanne ); } - private void assignTournamentGames(PGNTournament tournament) throws ChessHogScannerException { + private void assignTournamentGames(PGNTournament tournament) throws ScannerException { tournament.clearGames(); List gamesId = new ArrayList<>();