Cleanup: Converted typed MouseAdapter instances to MouseListener interface instances.

This commit is contained in:
Doublestrike
2012-02-12 06:02:21 +00:00
parent d61511cc37
commit 3d58ca1249
8 changed files with 21 additions and 12 deletions

View File

@@ -4,6 +4,7 @@ import java.awt.Toolkit;
import java.awt.datatransfer.StringSelection; import java.awt.datatransfer.StringSelection;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
@@ -48,7 +49,7 @@ public class ControlConstructed {
private final Map<String, String> colorVals; private final Map<String, String> colorVals;
private List<String> themeNames; private List<String> themeNames;
private List<String> deckNames; private List<String> deckNames;
private final MouseAdapter madStartGame, madDecksAI, madDecksHuman, private final MouseListener madStartGame, madDecksAI, madDecksHuman,
madHumanRandomDeck, madAIRandomDeck, madHumanRandomTheme, madAIRandomTheme; madHumanRandomDeck, madAIRandomDeck, madHumanRandomTheme, madAIRandomTheme;
/** /**

View File

@@ -2,6 +2,7 @@ package forge.control.home;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
@@ -28,7 +29,7 @@ import forge.view.toolbox.FSkin;
*/ */
public class ControlDraft { public class ControlDraft {
private final ViewDraft view; private final ViewDraft view;
private final MouseAdapter madBuildDeck, madDirections, madStartGame; private final MouseListener madBuildDeck, madDirections, madStartGame;
/** @param v0 &emsp; ViewDraft */ /** @param v0 &emsp; ViewDraft */
public ControlDraft(ViewDraft v0) { public ControlDraft(ViewDraft v0) {

View File

@@ -4,6 +4,7 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.io.File; import java.io.File;
import java.io.FilenameFilter; import java.io.FilenameFilter;
import java.util.HashMap; import java.util.HashMap;
@@ -51,7 +52,7 @@ public class ControlQuest {
private QuestEventManager qem; private QuestEventManager qem;
private JPanel selectedTab; private JPanel selectedTab;
private final MouseAdapter madStartGame, madDuels, madChallenges, private final MouseListener madStartGame, madDuels, madChallenges,
madQuests, madDecks, madPreferences; madQuests, madDecks, madPreferences;
private final ActionListener actPetSelect, actPlantSelect; private final ActionListener actPetSelect, actPlantSelect;
private final Command cmdSpellShop, cmdBazaar, private final Command cmdSpellShop, cmdBazaar,

View File

@@ -2,6 +2,7 @@ package forge.control.home;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -11,7 +12,6 @@ import javax.swing.JOptionPane;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import net.slightlymagic.braids.util.UtilFunctions; import net.slightlymagic.braids.util.UtilFunctions;
import forge.AllZone; import forge.AllZone;
import forge.Command; import forge.Command;
import forge.Constant; import forge.Constant;
@@ -38,7 +38,7 @@ public class ControlSealed {
private ViewSealed view; private ViewSealed view;
private DeckManager deckManager; private DeckManager deckManager;
private Map<String, Deck> aiDecks; private Map<String, Deck> aiDecks;
private final MouseAdapter madBuildDeck, madStartGame; private final MouseListener madBuildDeck, madStartGame;
/** /**
* Controls behavior of swing components in "sealed" mode menu. * Controls behavior of swing components in "sealed" mode menu.

View File

@@ -2,6 +2,7 @@ package forge.control.home;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
@@ -28,7 +29,7 @@ import forge.view.toolbox.FSkin;
*/ */
public class ControlUtilities { public class ControlUtilities {
private ViewUtilities view; private ViewUtilities view;
private final MouseAdapter madLicensing; private final MouseListener madLicensing;
private final Command cmdDeckEditor, cmdPicDownload, cmdSetDownload, private final Command cmdDeckEditor, cmdPicDownload, cmdSetDownload,
cmdQuestImages, cmdReportBug, cmdImportPictures, cmdHowToPlay, cmdDownloadPrices; cmdQuestImages, cmdReportBug, cmdImportPictures, cmdHowToPlay, cmdDownloadPrices;

View File

@@ -20,7 +20,9 @@ package forge.control.match;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionAdapter; import java.awt.event.MouseMotionAdapter;
import java.awt.event.MouseMotionListener;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Observable; import java.util.Observable;
@@ -69,8 +71,8 @@ public class ControlField {
private final Player player; private final Player player;
private final ViewField view; private final ViewField view;
private MouseMotionAdapter maCardOver; private MouseMotionListener maCardOver;
private MouseAdapter maAvatar, maLibrary, maHand, maExiled, maGraveyard, maFlashback, maCardClick; private MouseListener maAvatar, maLibrary, maHand, maExiled, maGraveyard, maFlashback, maCardClick;
private MouseAdapter maBlack, maBlue, maGreen, maRed, maWhite, maColorless; private MouseAdapter maBlack, maBlue, maGreen, maRed, maWhite, maColorless;

View File

@@ -21,7 +21,9 @@ import java.awt.Point;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionAdapter; import java.awt.event.MouseMotionAdapter;
import java.awt.event.MouseMotionListener;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@@ -39,8 +41,8 @@ import forge.Card;
import forge.Constant.Zone; import forge.Constant.Zone;
import forge.PlayerZone; import forge.PlayerZone;
import forge.view.GuiTopLevel; import forge.view.GuiTopLevel;
import forge.view.match.ViewHand;
import forge.view.match.MatchTopLevel; import forge.view.match.MatchTopLevel;
import forge.view.match.ViewHand;
/** /**
* Child controller - handles operations related to cards in user's hand and * Child controller - handles operations related to cards in user's hand and
@@ -51,8 +53,8 @@ public class ControlHand {
private final List<Card> cardsInPanel; private final List<Card> cardsInPanel;
private final ViewHand view; private final ViewHand view;
private MouseAdapter maCardClick; private MouseListener maCardClick;
private MouseMotionAdapter maCardMove; private MouseMotionListener maCardMove;
/** The o1. */ /** The o1. */
private Observer o1; private Observer o1;

View File

@@ -19,6 +19,7 @@ package forge.control.match;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.util.Observable; import java.util.Observable;
import java.util.Observer; import java.util.Observer;
@@ -36,7 +37,7 @@ import forge.view.match.ViewTabber;
*/ */
public class ControlTabber extends MyObservable { public class ControlTabber extends MyObservable {
private final ViewTabber view; private final ViewTabber view;
private MouseAdapter maMilling, maUnlimited, private MouseListener maMilling, maUnlimited,
maMana, maSetup, maTutor, maCounter, maTap, maUntap, maLife; maMana, maSetup, maTutor, maCounter, maTap, maUntap, maLife;
private Observer stackObserver, logObserver; private Observer stackObserver, logObserver;