Projects >> mage >>1e60605d84ca88c83fb1e63f80a9e79fadeb61b0

Chunk
Conflicting content 
import mage.client.util.gui.ArrowBuilder;
import mage.constants.CardType;
import mage.constants.EnlargeMode;
<<<<<<< HEAD
import mage.view.*;

import javax.swing.*;
import javax.swing.text.*;
import java.awt.*;
import java.awt.event.*;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;

import static mage.client.constants.Constants.*;
import org.mage.network.Client;
=======
import mage.remote.Session;
import mage.view.AbilityView;
import mage.view.CardView;
import mage.view.CounterView;
import mage.view.PermanentView;
import mage.view.StackAbilityView;
>>>>>>> dc6dc07e47ced34b10b13549382fefd637a96598

/**
 *
Solution content 
import mage.client.util.gui.ArrowBuilder;
import mage.constants.CardType;
import mage.constants.EnlargeMode;
import mage.view.AbilityView;
import mage.view.CardView;
import mage.view.CounterView;
import mage.view.PermanentView;
import mage.view.StackAbilityView;
import org.mage.network.Client;

/**
 *
File
Card.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
        draftBooster.loadBooster(CardsViewUtil.convertSimple(draftPickView.getBooster()), bigCard);
        this.draftBooster.clearCardEventListeners();
        this.draftBooster.addCardEventListener(
<<<<<<< HEAD
            new Listener () {
                @Override
                public void event(Event event) {
                    SimpleCardView source = (SimpleCardView) event.getSource();
                    if (event.getEventName().equals("pick-a-card")) {
                        DraftPickView view = client.pickCard(draftId, source.getId(), cardsHidden);
                        if (view != null) {
                            loadCardsToPickedCardsArea(view.getPicks());
                            draftBooster.loadBooster(emptyView, bigCard);                            
                            Plugins.getInstance().getActionCallback().hidePopup();
                            setMessage("Waiting for other players");
=======
                new Listener() {
                    @Override
                    public void event(Event event) {
                        if (event.getEventName().equals("pick-a-card")) {
                            SimpleCardView source = (SimpleCardView) event.getSource();
                            DraftPickView view = session.sendCardPick(draftId, source.getId(), cardsHidden);
                            if (view != null) {
                                loadCardsToPickedCardsArea(view.getPicks());
                                draftBooster.loadBooster(emptyView, bigCard);
                                Plugins.getInstance().getActionCallback().hideTooltipPopup();
                                setMessage("Waiting for other players");
                            }
                        }
                        if (event.getEventName().equals("mark-a-card")) {
                            SimpleCardView source = (SimpleCardView) event.getSource();
                            session.sendCardMark(draftId, source.getId());
>>>>>>> dc6dc07e47ced34b10b13549382fefd637a96598
                        }
                    }
                    if (event.getEventName().equals("mark-a-card")) {
Solution content 
        draftBooster.loadBooster(CardsViewUtil.convertSimple(draftPickView.getBooster()), bigCard);
        this.draftBooster.clearCardEventListeners();
        this.draftBooster.addCardEventListener(
            new Listener () {
                @Override
                public void event(Event event) {
                    SimpleCardView source = (SimpleCardView) event.getSource();
                    if (event.getEventName().equals("pick-a-card")) {
                        DraftPickView view = client.pickCard(draftId, source.getId(), cardsHidden);
                        if (view != null) {
                            loadCardsToPickedCardsArea(view.getPicks());
                            draftBooster.loadBooster(emptyView, bigCard);                            
                                Plugins.getInstance().getActionCallback().hideTooltipPopup();
                            setMessage("Waiting for other players");
                        }
                    }
                    if (event.getEventName().equals("mark-a-card")) {
File
DraftPanel.java
Developer's decision
Combination
Kind of conflict
Method invocation
Chunk
Conflicting content 
import static mage.constants.PlayerAction.TRIGGER_AUTO_ORDER_NAME_LAST;
import static mage.constants.PlayerAction.TRIGGER_AUTO_ORDER_RESET_ALL;
import mage.constants.Zone;
<<<<<<< HEAD
=======
import mage.game.events.PlayerQueryEvent;
import mage.remote.Session;
>>>>>>> dc6dc07e47ced34b10b13549382fefd637a96598
import mage.view.AbilityPickerView;
import mage.view.CardView;
import mage.view.CardsView;
Solution content 
import static mage.constants.PlayerAction.TRIGGER_AUTO_ORDER_NAME_LAST;
import static mage.constants.PlayerAction.TRIGGER_AUTO_ORDER_RESET_ALL;
import mage.constants.Zone;
import mage.game.events.PlayerQueryEvent;
import mage.view.AbilityPickerView;
import mage.view.CardView;
import mage.view.CardsView;
File
GamePanel.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import mage.view.RevealedView;
import mage.view.SimpleCardsView;
import org.apache.log4j.Logger;
<<<<<<< HEAD
import org.mage.network.Client;
=======
import org.mage.card.arcane.CardPanel;
>>>>>>> dc6dc07e47ced34b10b13549382fefd637a96598
import org.mage.plugins.card.utils.impl.ImageManagerImpl;

/**
Solution content 
import mage.view.RevealedView;
import mage.view.SimpleCardsView;
import org.apache.log4j.Logger;
import org.mage.card.arcane.CardPanel;
import org.mage.network.Client;
import org.mage.plugins.card.utils.impl.ImageManagerImpl;

/**
File
GamePanel.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
     * @param required
     * @param options
     */
<<<<<<< HEAD
    public void pickTarget(String message, CardsView cardView, GameView gameView, Set targets, boolean required, Map options) {
        ShowCardsDialog dialog = null;
        if (options != null && options.containsKey("targetZone")) {
            if (Zone.HAND.equals(options.get("targetZone"))) { // mark selectable target cards in hand
                List choosen = null;
                if (options.containsKey("chosen")) {
                    choosen = (List) options.get("chosen");
                }
                for (CardView card : gameView.getHand().values()) {
                    if (targets == null || targets.isEmpty()) {
                        card.setPlayable(false);
                        card.setChoosable(true);
                    } else if (targets.contains(card.getId())) {
                        card.setPlayable(false);
                        card.setChoosable(true);
=======
    public void pickTarget(String message, CardsView cardView, GameView gameView, Set targets, boolean required, Map options, int messageId) {
        PopUpMenuType popupMenuType = null;
        if (options != null) {
            if (options.containsKey("targetZone")) {
                if (Zone.HAND.equals(options.get("targetZone"))) { // mark selectable target cards in hand
                    List choosen = null;
                    if (options.containsKey("chosen")) {
                        choosen = (List) options.get("chosen");
>>>>>>> dc6dc07e47ced34b10b13549382fefd637a96598
                    }
                    for (CardView card : gameView.getHand().values()) {
                        if (targets == null || targets.isEmpty()) {
Solution content 
     * @param required
     * @param options
     */
    public void pickTarget(String message, CardsView cardView, GameView gameView, Set targets, boolean required, Map options) {
        PopUpMenuType popupMenuType = null;
        if (options != null) {
            if (options.containsKey("targetZone")) {
            if (Zone.HAND.equals(options.get("targetZone"))) { // mark selectable target cards in hand
                List choosen = null;
                if (options.containsKey("chosen")) {
                    choosen = (List) options.get("chosen");
                }
                for (CardView card : gameView.getHand().values()) {
                    if (targets == null || targets.isEmpty()) {
                        card.setPlayable(false);
                        card.setChoosable(true);
                    } else if (targets.contains(card.getId())) {
                        card.setPlayable(false);
                        card.setChoosable(true);
                    }
File
GamePanel.java
Developer's decision
Combination
Kind of conflict
Cast expression
Comment
For statement
If statement
Method invocation
Method signature
Variable
Chunk
Conflicting content 
    private BigCard bigCard;
    private JPopupMenu jPopupMenu;
    protected static final DefaultActionCallback defaultCallback = DefaultActionCallback.getInstance();
<<<<<<< HEAD
    protected static Client client = MageFrame.getClient();
    private CardView popupCard;
=======
    protected static Session session = MageFrame.getSession();
    private CardView tooltipCard;
>>>>>>> dc6dc07e47ced34b10b13549382fefd637a96598
    private TransferData popupData;
    private JComponent cardInfoPane;
    private volatile boolean popupTextWindowOpen = false;
Solution content 
    private JPopupMenu jPopupMenu;
    private BigCard bigCard;
    protected static final DefaultActionCallback defaultCallback = DefaultActionCallback.getInstance();
    protected static Client client = MageFrame.getClient();
    private CardView tooltipCard;
    private TransferData popupData;
    private JComponent cardInfoPane;
    private volatile boolean popupTextWindowOpen = false;
File
MageActionCallback.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
            public void run() {
                ThreadUtils.sleep(300);

<<<<<<< HEAD
                if (popupCard == null || !popupCard.equals(data.card) || client == null || !popupTextWindowOpen || !enlargedWindowState.equals(EnlargedWindowState.CLOSED)) {
=======
                if (tooltipCard == null || !tooltipCard.equals(data.card) || session == null || !popupTextWindowOpen || !enlargedWindowState.equals(EnlargedWindowState.CLOSED)) {
>>>>>>> dc6dc07e47ced34b10b13549382fefd637a96598
                    return;
                }
Solution content 
            public void run() {
                ThreadUtils.sleep(300);

                if (tooltipCard == null || !tooltipCard.equals(data.card) || client == null || !popupTextWindowOpen || !enlargedWindowState.equals(EnlargedWindowState.CLOSED)) {
                    return;
                }
File
MageActionCallback.java
Developer's decision
Manual
Kind of conflict
If statement