source refactoring

nicho92 · Sep 19, 2023 · afe71ca · afe71ca
1 parent 05b6ed0
commit afe71ca
Show file tree

Hide file tree

Showing 28 changed files with 39 additions and 38 deletions.
diff --git a/.temp-NetworkCli-classpath-arg-1695124264247.txt b/.temp-NetworkCli-classpath-arg-1695124264247.txt
diff --git a/src/main/java/org/magic/game/gui/components/LightDescribeCardPanel.java b/src/main/java/org/magic/game/gui/components/LightDescribeCardPanel.java
@@ -21,8 +21,8 @@
 import org.jdesktop.beansbinding.Bindings;
 import org.magic.api.beans.MTGRuling;
 import org.magic.api.beans.MagicCard;
-import org.magic.gui.components.MagicTextPane;
-import org.magic.gui.components.ManaPanel;
+import org.magic.gui.components.card.MagicTextPane;
+import org.magic.gui.components.card.ManaPanel;
 
 public class LightDescribeCardPanel extends JPanel {
 	/**

diff --git a/src/main/java/org/magic/game/gui/components/ManaPoolPanel.java b/src/main/java/org/magic/game/gui/components/ManaPoolPanel.java
@@ -9,7 +9,7 @@
 
 import org.magic.game.model.ManaPool;
 import org.magic.game.model.Player;
-import org.magic.gui.components.ManaPanel;
+import org.magic.gui.components.card.ManaPanel;
 import org.utils.patterns.observer.Observable;
 import org.utils.patterns.observer.Observer;
 

diff --git a/src/main/java/org/magic/game/gui/components/renderer/SpellRendererPanel.java b/src/main/java/org/magic/game/gui/components/renderer/SpellRendererPanel.java
@@ -11,7 +11,7 @@
 import org.magic.api.beans.enums.EnumColors;
 import org.magic.game.model.AbstractSpell;
 import org.magic.game.model.abilities.AbstractAbilities;
-import org.magic.gui.components.MagicTextPane;
+import org.magic.gui.components.card.MagicTextPane;
 import org.magic.services.MTGConstants;
 
 public class SpellRendererPanel extends JPanel {

diff --git a/src/main/java/org/magic/gui/CollectionPanelGUI.java b/src/main/java/org/magic/gui/CollectionPanelGUI.java
@@ -47,22 +47,22 @@
 import org.magic.api.interfaces.MTGDao;
 import org.magic.gui.abstracts.AbstractBuzyIndicatorComponent;
 import org.magic.gui.abstracts.MTGUIComponent;
-import org.magic.gui.components.CardSearchPanel;
-import org.magic.gui.components.CardStockPanel;
-import org.magic.gui.components.CardsDeckCheckerPanel;
-import org.magic.gui.components.CardsEditionTablePanel;
 import org.magic.gui.components.GedPanel;
 import org.magic.gui.components.GroupedShoppingPanel;
 import org.magic.gui.components.JLazyLoadingTree;
 import org.magic.gui.components.PackagesBrowserPanel;
 import org.magic.gui.components.PricesTablePanel;
-import org.magic.gui.components.TokensTablePanel;
+import org.magic.gui.components.card.CardSearchPanel;
+import org.magic.gui.components.card.CardStockPanel;
+import org.magic.gui.components.card.CardsEditionTablePanel;
 import org.magic.gui.components.card.MagicCardDetailPanel;
 import org.magic.gui.components.card.MagicEditionDetailPanel;
+import org.magic.gui.components.card.TokensTablePanel;
 import org.magic.gui.components.charts.HistoryPricesPanel;
 import org.magic.gui.components.charts.ManaRepartitionPanel;
 import org.magic.gui.components.charts.RarityRepartitionPanel;
 import org.magic.gui.components.charts.TypeRepartitionPanel;
+import org.magic.gui.components.deck.CardsDeckCheckerPanel;
 import org.magic.gui.components.dialog.MassCollectionImporterDialog;
 import org.magic.gui.components.dialog.MassMoverDialog;
 import org.magic.gui.components.dialog.WebSiteGeneratorDialog;

diff --git a/src/main/java/org/magic/gui/ConfigurationPanelGUI.java b/src/main/java/org/magic/gui/ConfigurationPanelGUI.java
@@ -47,7 +47,7 @@
 import org.magic.api.interfaces.MTGTrackingService;
 import org.magic.api.interfaces.MTGWallpaperProvider;
 import org.magic.gui.abstracts.MTGUIComponent;
-import org.magic.gui.components.ConfigurationPanel;
+import org.magic.gui.components.tech.ConfigurationPanel;
 import org.magic.gui.components.tech.HelpCompononent;
 import org.magic.gui.models.conf.PluginTreeTableModel;
 import org.magic.gui.renderer.MTGPluginTreeCellRenderer;

diff --git a/src/main/java/org/magic/gui/MagicGUI.java b/src/main/java/org/magic/gui/MagicGUI.java
@@ -37,8 +37,8 @@
 import org.magic.api.pricers.impl.MagicCardMarketPricer2;
 import org.magic.gui.abstracts.MTGUIComponent;
 import org.magic.gui.components.BinderTagsEditorComponent;
-import org.magic.gui.components.CardSearchPanel;
 import org.magic.gui.components.ScriptPanel;
+import org.magic.gui.components.card.CardSearchPanel;
 import org.magic.gui.components.dialog.AboutDialog;
 import org.magic.gui.components.dialog.ChromeDownloader;
 import org.magic.gui.components.dialog.TipsOfTheDayDialog;

diff --git a/src/main/java/org/magic/gui/StockPanelGUI.java b/src/main/java/org/magic/gui/StockPanelGUI.java
@@ -50,13 +50,13 @@
 import org.magic.api.interfaces.MTGPriceSuggester;
 import org.magic.gui.abstracts.AbstractBuzyIndicatorComponent;
 import org.magic.gui.abstracts.MTGUIComponent;
-import org.magic.gui.components.CardsDeckCheckerPanel;
 import org.magic.gui.components.GedPanel;
 import org.magic.gui.components.GradingEditorPane;
 import org.magic.gui.components.PriceSuggesterComponent;
 import org.magic.gui.components.PricesTablePanel;
 import org.magic.gui.components.card.MagicCardDetailPanel;
 import org.magic.gui.components.charts.HistoryPricesPanel;
+import org.magic.gui.components.deck.CardsDeckCheckerPanel;
 import org.magic.gui.components.dialog.CardSearchImportDialog;
 import org.magic.gui.components.shops.StockItemsSynchronizationPanel;
 import org.magic.gui.components.tech.ObjectViewerPanel;

diff --git a/...ic/gui/components/CardAbilitiesPanel.java → ...i/components/card/CardAbilitiesPanel.java b/...ic/gui/components/CardAbilitiesPanel.java → ...i/components/card/CardAbilitiesPanel.java
@@ -1,4 +1,4 @@
-package org.magic.gui.components;
+package org.magic.gui.components.card;
 
 import java.awt.BorderLayout;
 

diff --git a/...magic/gui/components/CardSearchPanel.java → .../gui/components/card/CardSearchPanel.java b/...magic/gui/components/CardSearchPanel.java → .../gui/components/card/CardSearchPanel.java
@@ -1,4 +1,4 @@
-package org.magic.gui.components;
+package org.magic.gui.components.card;
 
 import static org.magic.services.tools.MTG.capitalize;
 import static org.magic.services.tools.MTG.getEnabledPlugin;
@@ -59,13 +59,18 @@
 import org.magic.game.gui.components.HandPanel;
 import org.magic.gui.abstracts.AbstractBuzyIndicatorComponent;
 import org.magic.gui.abstracts.MTGUIComponent;
-import org.magic.gui.components.card.MagicCardDetailPanel;
-import org.magic.gui.components.card.MagicEditionDetailPanel;
+import org.magic.gui.components.GedPanel;
+import org.magic.gui.components.IASuggestionPanel;
+import org.magic.gui.components.ImagePanel;
+import org.magic.gui.components.PricesTablePanel;
+import org.magic.gui.components.RulesPanel;
+import org.magic.gui.components.SimilarityCardPanel;
 import org.magic.gui.components.charts.CmcChartPanel;
 import org.magic.gui.components.charts.HistoryPricesPanel;
 import org.magic.gui.components.charts.ManaRepartitionPanel;
 import org.magic.gui.components.charts.RarityRepartitionPanel;
 import org.magic.gui.components.charts.TypeRepartitionPanel;
+import org.magic.gui.components.deck.CardsDeckCheckerPanel;
 import org.magic.gui.components.dialog.AdvancedSearchQueryDialog;
 import org.magic.gui.components.tech.CriteriaComponent;
 import org.magic.gui.components.tech.ObjectViewerPanel;

diff --git a/.../magic/gui/components/CardStockPanel.java → ...c/gui/components/card/CardStockPanel.java b/.../magic/gui/components/CardStockPanel.java → ...c/gui/components/card/CardStockPanel.java
@@ -1,4 +1,4 @@
-package org.magic.gui.components;
+package org.magic.gui.components.card;
 
 import static org.magic.services.tools.MTG.getEnabledPlugin;
 

diff --git a/...ui/components/CardsEditionTablePanel.java → ...mponents/card/CardsEditionTablePanel.java b/...ui/components/CardsEditionTablePanel.java → ...mponents/card/CardsEditionTablePanel.java
@@ -1,4 +1,4 @@
-package org.magic.gui.components;
+package org.magic.gui.components.card;
 
 import static org.magic.services.tools.MTG.capitalize;
 import static org.magic.services.tools.MTG.getEnabledPlugin;

diff --git a/src/main/java/org/magic/gui/components/card/MagicCardMainDetailPanel.java b/src/main/java/org/magic/gui/components/card/MagicCardMainDetailPanel.java
@@ -37,8 +37,6 @@
 import org.magic.api.interfaces.MTGCardsExport;
 import org.magic.api.interfaces.MTGDao;
 import org.magic.api.interfaces.MTGPictureProvider;
-import org.magic.gui.components.MagicTextPane;
-import org.magic.gui.components.ManaPanel;
 import org.magic.services.MTGConstants;
 import org.magic.services.MTGControler;
 import org.magic.services.logging.MTGLogger;

diff --git a/src/main/java/org/magic/gui/components/card/MagicEditionDetailPanel.java b/src/main/java/org/magic/gui/components/card/MagicEditionDetailPanel.java
@@ -22,7 +22,6 @@
 import org.magic.api.beans.enums.EnumExtra;
 import org.magic.api.interfaces.MTGCardsProvider;
 import org.magic.gui.abstracts.MTGUIComponent;
-import org.magic.gui.components.CardSearchPanel;
 import org.magic.gui.components.widgets.JLangLabel;
 import org.magic.services.MTGConstants;
 import org.magic.services.tools.UITools;

diff --git a/...g/magic/gui/components/MagicTextPane.java → ...ic/gui/components/card/MagicTextPane.java b/...g/magic/gui/components/MagicTextPane.java → ...ic/gui/components/card/MagicTextPane.java
@@ -1,4 +1,4 @@
-package org.magic.gui.components;
+package org.magic.gui.components.card;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;

diff --git a/...a/org/magic/gui/components/ManaPanel.java → .../magic/gui/components/card/ManaPanel.java b/...a/org/magic/gui/components/ManaPanel.java → .../magic/gui/components/card/ManaPanel.java
@@ -1,4 +1,4 @@
-package org.magic.gui.components;
+package org.magic.gui.components.card;
 
 import java.awt.FlowLayout;
 import java.awt.Image;

diff --git a/...agic/gui/components/TokensTablePanel.java → ...gui/components/card/TokensTablePanel.java b/...agic/gui/components/TokensTablePanel.java → ...gui/components/card/TokensTablePanel.java
@@ -1,4 +1,4 @@
-package org.magic.gui.components;
+package org.magic.gui.components.card;
 
 import static org.magic.services.tools.MTG.getEnabledPlugin;
 

diff --git a/...gui/components/CardsDeckCheckerPanel.java → ...omponents/deck/CardsDeckCheckerPanel.java b/...gui/components/CardsDeckCheckerPanel.java → ...omponents/deck/CardsDeckCheckerPanel.java
@@ -1,4 +1,4 @@
-package org.magic.gui.components;
+package org.magic.gui.components.deck;
 
 import java.awt.BorderLayout;
 import java.awt.event.ComponentAdapter;

diff --git a/src/main/java/org/magic/gui/components/deck/ConstructPanel.java b/src/main/java/org/magic/gui/components/deck/ConstructPanel.java
@@ -63,9 +63,9 @@
 import org.magic.game.model.Player;
 import org.magic.gui.abstracts.AbstractBuzyIndicatorComponent;
 import org.magic.gui.abstracts.MTGUIComponent;
-import org.magic.gui.components.CardStockPanel;
 import org.magic.gui.components.IASuggestionPanel;
 import org.magic.gui.components.RulesPanel;
+import org.magic.gui.components.card.CardStockPanel;
 import org.magic.gui.components.card.ComboFinderPanel;
 import org.magic.gui.components.card.MagicCardDetailPanel;
 import org.magic.gui.components.charts.CmcChartPanel;

diff --git a/src/main/java/org/magic/gui/components/deck/DeckDetailsPanel.java b/src/main/java/org/magic/gui/components/deck/DeckDetailsPanel.java
@@ -30,7 +30,7 @@
 import org.magic.api.beans.MagicCard;
 import org.magic.api.beans.MagicDeck;
 import org.magic.api.interfaces.MTGPictureProvider;
-import org.magic.gui.components.ManaPanel;
+import org.magic.gui.components.card.ManaPanel;
 import org.magic.gui.components.editor.JTagsPanel;
 import org.magic.gui.components.widgets.JLangLabel;
 import org.magic.services.MTGControler;

diff --git a/src/main/java/org/magic/gui/components/dialog/CardSearchImportDialog.java b/src/main/java/org/magic/gui/components/dialog/CardSearchImportDialog.java
@@ -9,7 +9,7 @@
 import javax.swing.WindowConstants;
 
 import org.magic.api.beans.MagicCard;
-import org.magic.gui.components.CardSearchPanel;
+import org.magic.gui.components.card.CardSearchPanel;
 import org.magic.services.MTGConstants;
 
 public class CardSearchImportDialog extends JDialog {

diff --git a/src/main/java/org/magic/gui/components/editor/JSuggestedPanel.java b/src/main/java/org/magic/gui/components/editor/JSuggestedPanel.java
@@ -12,7 +12,7 @@
 import javax.swing.text.BadLocationException;
 
 import org.magic.api.interfaces.MTGTextGenerator;
-import org.magic.gui.components.MagicTextPane;
+import org.magic.gui.components.card.MagicTextPane;
 import org.magic.services.MTGConstants;
 
 public class JSuggestedPanel extends JComponent {

diff --git a/src/main/java/org/magic/gui/components/editor/MagicCardEditorPanel.java b/src/main/java/org/magic/gui/components/editor/MagicCardEditorPanel.java
@@ -50,8 +50,8 @@
 import org.magic.api.interfaces.MTGTextGenerator;
 import org.magic.api.interfaces.abstracts.AbstractPicturesEditorProvider;
 import org.magic.gui.abstracts.MTGUIComponent;
-import org.magic.gui.components.MagicTextPane;
-import org.magic.gui.components.ManaPanel;
+import org.magic.gui.components.card.MagicTextPane;
+import org.magic.gui.components.card.ManaPanel;
 import org.magic.services.MTGConstants;
 import org.magic.services.network.URLTools;
 import org.magic.services.tools.ImageTools;

diff --git a/src/main/java/org/magic/gui/components/renderer/CardListPanel.java b/src/main/java/org/magic/gui/components/renderer/CardListPanel.java
@@ -10,7 +10,7 @@
 import javax.swing.border.LineBorder;
 
 import org.magic.api.beans.MagicCard;
-import org.magic.gui.components.ManaPanel;
+import org.magic.gui.components.card.ManaPanel;
 import org.magic.services.MTGControler;
 import org.magic.services.providers.IconSetProvider;
 import org.magic.services.tools.UITools;

diff --git a/src/main/java/org/magic/gui/components/shops/ContactsManagementPanel.java b/src/main/java/org/magic/gui/components/shops/ContactsManagementPanel.java
@@ -14,7 +14,7 @@
 import org.magic.api.beans.shop.Contact;
 import org.magic.gui.abstracts.AbstractBuzyIndicatorComponent;
 import org.magic.gui.abstracts.MTGUIComponent;
-import org.magic.gui.components.CardStockPanel;
+import org.magic.gui.components.card.CardStockPanel;
 import org.magic.gui.components.tech.ObjectViewerPanel;
 import org.magic.gui.models.ContactTableModel;
 import org.magic.services.MTGConstants;

diff --git a/...ic/gui/components/ConfigurationPanel.java → ...i/components/tech/ConfigurationPanel.java b/...ic/gui/components/ConfigurationPanel.java → ...i/components/tech/ConfigurationPanel.java
@@ -1,4 +1,4 @@
-package org.magic.gui.components;
+package org.magic.gui.components.tech;
 
 import static org.magic.services.tools.MTG.capitalize;
 import static org.magic.services.tools.MTG.getEnabledPlugin;
@@ -60,8 +60,6 @@
 import org.magic.gui.abstracts.AbstractBuzyIndicatorComponent;
 import org.magic.gui.abstracts.MTGUIComponent;
 import org.magic.gui.components.dialog.DefaultStockEditorDialog;
-import org.magic.gui.components.tech.MTGAuthenticatorEditor;
-import org.magic.gui.components.tech.ShortKeyManagerUI;
 import org.magic.gui.components.widgets.JFontChooser;
 import org.magic.gui.components.widgets.JLangLabel;
 import org.magic.gui.components.widgets.JResizerPanel;

diff --git a/src/main/java/org/magic/gui/renderer/MagicCardsTreeCellRenderer.java b/src/main/java/org/magic/gui/renderer/MagicCardsTreeCellRenderer.java
@@ -16,7 +16,7 @@
 import org.magic.api.beans.MagicCard;
 import org.magic.api.beans.MagicEdition;
 import org.magic.api.beans.enums.EnumColors;
-import org.magic.gui.components.ManaPanel;
+import org.magic.gui.components.card.ManaPanel;
 import org.magic.services.MTGConstants;
 import org.magic.services.providers.IconSetProvider;
 

diff --git a/src/main/java/org/magic/gui/renderer/ManaCellRenderer.java b/src/main/java/org/magic/gui/renderer/ManaCellRenderer.java
@@ -5,7 +5,7 @@
 import javax.swing.JTable;
 import javax.swing.table.TableCellRenderer;
 
-import org.magic.gui.components.ManaPanel;
+import org.magic.gui.components.card.ManaPanel;
 
 public class ManaCellRenderer implements TableCellRenderer {