From 88ec398e8c2d1ff24bab9e33f6282a5ae546b5fb Mon Sep 17 00:00:00 2001 From: leriomaggio Date: Sat, 2 Oct 2021 08:27:27 +0100 Subject: [PATCH] Changed API to make isSectionImportable public rather than protected This is to allow DeckImport to get all the supported DeckSections in current editor, without relying on using the content of the cbxSection dropdown UI component. Signed-off-by: leriomaggio --- .../java/forge/screens/deckeditor/controllers/CDeckEditor.java | 2 +- .../forge/screens/deckeditor/controllers/CEditorCommander.java | 2 +- .../screens/deckeditor/controllers/CEditorConstructed.java | 2 +- .../forge/screens/deckeditor/controllers/CEditorLimited.java | 2 +- .../java/forge/screens/deckeditor/controllers/CEditorQuest.java | 2 +- .../screens/deckeditor/controllers/CEditorQuestLimited.java | 2 +- .../forge/screens/deckeditor/controllers/CEditorVariant.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckEditor.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckEditor.java index f643cb042f5..7629abd7a30 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckEditor.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckEditor.java @@ -38,7 +38,7 @@ public abstract class CDeckEditor extends ACEditorBase< return result; } - protected Boolean isSectionImportable(DeckSection section) { + public Boolean isSectionImportable(DeckSection section) { return section == DeckSection.Main; } diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorCommander.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorCommander.java index 4264da93a19..7e3d6d8ddc1 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorCommander.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorCommander.java @@ -195,7 +195,7 @@ public final class CEditorCommander extends CDeckEditor { } @Override - protected Boolean isSectionImportable(DeckSection section) { + public Boolean isSectionImportable(DeckSection section) { return allSections.contains(section); } diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java index d638aac0451..0a64b686389 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java @@ -403,7 +403,7 @@ public final class CEditorConstructed extends CDeckEditor { } @Override - protected Boolean isSectionImportable(DeckSection section) { + public Boolean isSectionImportable(DeckSection section) { return allSections.contains(section); } diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorLimited.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorLimited.java index 0765070f04b..51f6e4c432a 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorLimited.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorLimited.java @@ -183,7 +183,7 @@ public final class CEditorLimited extends CDeckEditor { } @Override - protected Boolean isSectionImportable(DeckSection section) { + public Boolean isSectionImportable(DeckSection section) { return section != DeckSection.Sideboard && allSections.contains(section); } diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java index 8df79f79384..609306e7a84 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java @@ -372,7 +372,7 @@ public final class CEditorQuest extends CDeckEditor { } @Override - protected Boolean isSectionImportable(DeckSection section) { + public Boolean isSectionImportable(DeckSection section) { return allSections.contains(section); } diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java index 9df0e6d4c67..14fb6b50202 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java @@ -212,7 +212,7 @@ public final class CEditorQuestLimited extends CDeckEditor { } @Override - protected Boolean isSectionImportable(DeckSection section) { + public Boolean isSectionImportable(DeckSection section) { return section != DeckSection.Sideboard && allSections.contains(section); } diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java index c2b16c584aa..c44f93f2d77 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java @@ -159,7 +159,7 @@ public final class CEditorVariant extends CDeckEditor { } @Override - protected Boolean isSectionImportable(DeckSection section) { + public Boolean isSectionImportable(DeckSection section) { return true; }