External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 02:30:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: moved draft grid component to correct package, improved netbeans editor compatibility

Browse source
This commit is contained in:
Oleg Agafonov 2023-12-14 23:51:41 +04:00
parent 0dbd86fb58
commit df26ab5156
4 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage.Client/src/main/java/mage/client/cards/DraftGrid.form → Mage.Client/src/main/java/mage/client/draft/DraftGrid.form
View file

@ -11,6 +11,7 @@
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,44,0,0,1,-112"/>
</AuxValues>
<Layout>

22
Mage.Client/src/main/java/mage/client/cards/DraftGrid.java → Mage.Client/src/main/java/mage/client/draft/DraftGrid.java
View file

@ -1,10 +1,9 @@
package mage.client.cards;
package mage.client.draft;
import mage.abilities.icon.CardIconRenderSettings;
import mage.cards.CardDimensions;
import mage.cards.MageCard;
import mage.client.dialog.PreferencesDialog;
import mage.client.draft.DraftPanel;
import mage.client.plugins.impl.Plugins;
import mage.client.util.ClientEventType;
import mage.client.util.Event;
@ -19,6 +18,9 @@ import org.apache.log4j.Logger;
import java.awt.*;
import java.util.ArrayList;
import java.util.List;
import mage.client.cards.BigCard;
import mage.client.cards.CardEventProducer;
import mage.client.cards.CardEventSource;
/**
* Drafting: panel with the picks
@ -29,24 +31,24 @@ public class DraftGrid extends javax.swing.JPanel implements CardEventProducer {
private static final Logger logger = Logger.getLogger(DraftGrid.class);
private final DraftPanel parentPanel;
private DraftPanel parentPanel;
protected final CardEventSource cardEventSource = new CardEventSource();
protected BigCard bigCard;
protected MageCard markedCard;
protected boolean emptyGrid;
/**
* Creates new form DraftGrid
*/
public DraftGrid(DraftPanel panel) {
public DraftGrid() {
initComponents();
parentPanel = panel;
markedCard = null;
emptyGrid = true;
// ENABLE picks and other actions
cardEventSource.addListener(event -> {
if (this.parentPanel == null) {
this.parentPanel = (DraftPanel) this.getParent();
}
if (event.getEventType() == ClientEventType.CARD_DOUBLE_CLICK
|| event.getEventType() == ClientEventType.CARD_CLICK) {
// There is a protection against picking too early in DraftPanel logic.
@ -95,6 +97,10 @@ public class DraftGrid extends javax.swing.JPanel implements CardEventProducer {
this.bigCard = bigCard;
this.removeAll();
if (booster == null) {
return;
}
int maxRows = 4;
int numColumns = 5;

2
Mage.Client/src/main/java/mage/client/draft/DraftPanel.form
View file

@ -527,7 +527,7 @@
</Container>
<Component class="mage.client.cards.CardsList" name="draftPicks">
</Component>
<Container class="mage.client.cards.DraftGrid" name="draftBooster">
<Container class="mage.client.draft.DraftGrid" name="draftBooster">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">

4
Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
View file

@ -559,7 +559,7 @@
lblPlayer15 = new javax.swing.JLabel();
lblPlayer16 = new javax.swing.JLabel();
draftPicks = new mage.client.cards.CardsList();
draftBooster = new mage.client.cards.DraftGrid(this);
draftBooster = new mage.client.draft.DraftGrid();
draftLeftPane.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED));
draftLeftPane.setFocusable(false);
@ -879,7 +879,7 @@
private javax.swing.JCheckBox chkPack1;
private javax.swing.JCheckBox chkPack2;
private javax.swing.JCheckBox chkPack3;
private mage.client.cards.DraftGrid draftBooster;
private mage.client.draft.DraftGrid draftBooster;
private javax.swing.JPanel draftLeftPane;
private mage.client.cards.CardsList draftPicks;
private javax.swing.JPanel jPanel1;