From eab0650f3f66532798b148fa02ff3920e2855f49 Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Mon, 16 Sep 2019 23:16:45 -0700 Subject: [PATCH] Logging blueprint id for a card not found --- .../gempukku/lotro/game/CardNotFoundException.java | 3 +++ .../lotro/game/LotroCardBlueprintLibrary.java | 12 +++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/CardNotFoundException.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/CardNotFoundException.java index 673f13d32..5ec818017 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/CardNotFoundException.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/CardNotFoundException.java @@ -1,4 +1,7 @@ package com.gempukku.lotro.game; public class CardNotFoundException extends Exception { + public CardNotFoundException(String blueprint) { + super(blueprint); + } } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java index 43c3b58aa..8988892fb 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java @@ -55,7 +55,7 @@ public class LotroCardBlueprintLibrary { private void initCardSets(CardSets cardSets) { for (SetDefinition setDefinition : cardSets.getSetDefinitions().values()) { - if (setDefinition.hasFlag("needsLoading")) { +// if (setDefinition.hasFlag("needsLoading")) { logger.debug("Loading set " + setDefinition.getSetId()); final Set allCards = setDefinition.getAllCards(); for (String blueprintId : allCards) { @@ -70,7 +70,7 @@ public class LotroCardBlueprintLibrary { } } } - } +// } } } @@ -220,16 +220,14 @@ public class LotroCardBlueprintLibrary { LotroCardBlueprint blueprint = null; try { blueprint = tryLoadingFromPackage(packageName, setNumber, cardNumber); - } catch (IllegalAccessException e) { - throw new CardNotFoundException(); - } catch (InstantiationException e) { - throw new CardNotFoundException(); + } catch (IllegalAccessException | InstantiationException e) { + throw new CardNotFoundException(blueprintId); } if (blueprint != null) return blueprint; } - throw new CardNotFoundException(); + throw new CardNotFoundException(blueprintId); } private LotroCardBlueprint tryLoadingFromPackage(String packageName, String setNumber, String cardNumber) throws IllegalAccessException, InstantiationException {