diff --git a/.gitattributes b/.gitattributes index 9b1f96d6cb5..6a84884069e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -31,169 +31,172 @@ res/quest/uncommon.txt -text svneol=native#text/plain res/rare.txt -text svneol=native#text/plain res/tokens.txt -text svneol=native#text/plain res/uncommon.txt -text svneol=native#text/plain -src/Ability.java svneol=native#text/plain -src/Ability_Activated.java svneol=native#text/plain -src/Ability_Hand.java svneol=native#text/plain -src/Ability_Mana.java -text svneol=native#text/plain -src/Ability_Tap.java svneol=native#text/plain -src/All.java svneol=native#text/plain -src/AllZone.java svneol=native#text/plain -src/BackgroundPanel.java -text svneol=native#text/plain -src/BoosterDraft.java svneol=native#text/plain -src/BoosterDraftAI.java svneol=native#text/plain -src/BoosterPack.java svneol=native#text/plain -src/ButtonUtil.java svneol=native#text/plain -src/Card.java svneol=native#text/plain -src/CardDetailUtil.java svneol=native#text/plain -src/CardFactory.java svneol=native#text/plain -src/CardFactoryUtil.java svneol=native#text/plain -src/CardFactory_Auras.java -text svneol=native#text/plain -src/CardFactory_Creatures.java -text svneol=native#text/plain -src/CardFactory_Equipment.java -text svneol=native#text/plain -src/CardFactory_Lands.java -text svneol=native#text/plain -src/CardFactory_Planeswalkers.java -text svneol=native#text/plain -src/CardList.java svneol=native#text/plain -src/CardListFilter.java svneol=native#text/plain -src/CardListUtil.java svneol=native#text/plain -src/CardPanel.java svneol=native#text/plain -src/CardParser.java svneol=native#text/plain -src/CardUtil.java svneol=native#text/plain -src/Combat.java svneol=native#text/plain -src/CombatPlaneswalker.java svneol=native#text/plain -src/CombatUtil.java svneol=native#text/plain -src/Command.java svneol=native#text/plain -src/CommandArgs.java svneol=native#text/plain -src/CommandList.java svneol=native#text/plain -src/CommandReturn.java svneol=native#text/plain -src/Computer.java svneol=native#text/plain -src/ComputerAI_Burn.java svneol=native#text/plain -src/ComputerAI_Burn2.java svneol=native#text/plain -src/ComputerAI_General.java svneol=native#text/plain -src/ComputerAI_Input.java svneol=native#text/plain -src/ComputerAI_Rats2.java svneol=native#text/plain -src/ComputerAI_StackNotEmpty.java svneol=native#text/plain -src/ComputerAI_Testing.java svneol=native#text/plain -src/ComputerAI_counterSpells.java -text svneol=native#text/plain -src/ComputerUtil.java -text svneol=native#text/plain -src/ComputerUtil_Attack2.java svneol=native#text/plain -src/ComputerUtil_Block2.java svneol=native#text/plain -src/Computer_Cleanup.java svneol=native#text/plain -src/Computer_Draw.java svneol=native#text/plain -src/Computer_Race.java svneol=native#text/plain -src/Constant.java svneol=native#text/plain src/Deck.java svneol=native#text/plain -src/DeckIO.java svneol=native#text/plain -src/DefaultPlayerZone.java svneol=native#text/plain -src/Display.java svneol=native#text/plain -src/EndOfTurn.java svneol=native#text/plain -src/ExternalPanel.java svneol=native#text/plain -src/FileUtil.java -text svneol=native#text/plain -src/GameAction.java svneol=native#text/plain -src/GameActionUtil.java svneol=native#text/plain -src/GenerateConstructedDeck.java svneol=native#text/plain -src/GenerateConstructedMultiColorDeck.java -text svneol=native#text/plain -src/GenerateDraftDeck.java svneol=native#text/plain -src/GenerateSealedDeck.java svneol=native#text/plain -src/GuiDisplay.java svneol=native#text/plain -src/GuiDisplay2.java svneol=native#text/plain -src/GuiDisplay3.java -text svneol=native#text/plain -src/GuiDisplayUtil.java svneol=native#text/plain -src/GuiInput.java svneol=native#text/plain -src/Gui_BoosterDraft.java svneol=native#text/plain -src/Gui_DeckEditor.java -text svneol=native#text/plain -src/Gui_DeckEditorNew.java -text svneol=native#text/plain -src/Gui_DeckEditor_Menu.java svneol=native#text/plain -src/Gui_DownloadPictures.java svneol=native#text/plain -src/Gui_MultipleBlockers.java svneol=native#text/plain -src/Gui_NewGame.java svneol=native#text/plain -src/Gui_Quest.java svneol=native#text/plain -src/Gui_QuestOptions.java svneol=native#text/plain -src/Gui_Quest_DeckEditor.java -text svneol=native#text/plain -src/Gui_Quest_DeckEditor_Menu.java -text svneol=native#text/plain -src/Gui_SealedDeck.java svneol=native#text/plain -src/Gui_SetEditor.java svneol=native#text/plain -src/Gui_Welcome.java svneol=native#text/plain -src/Gui_WinLose.java svneol=native#text/plain -src/IO.java svneol=native#text/plain -src/ImageCache.java svneol=native#text/plain -src/ImageJPanel.java -text svneol=native#text/plain -src/ImageUtil.java svneol=native#text/plain -src/Input.java svneol=native#text/plain -src/InputControl.java svneol=native#text/plain -src/InputUtil.java svneol=native#text/plain -src/Input_Attack.java svneol=native#text/plain -src/Input_Attack_Instant.java -text svneol=native#text/plain -src/Input_Attack_Planeswalker.java svneol=native#text/plain -src/Input_Before_Attack_Instant.java -text svneol=native#text/plain -src/Input_Block.java svneol=native#text/plain -src/Input_Block_Instant.java svneol=native#text/plain -src/Input_Block_Planeswalker.java svneol=native#text/plain -src/Input_Cleanup.java svneol=native#text/plain -src/Input_CombatDamage.java svneol=native#text/plain -src/Input_Draw.java svneol=native#text/plain -src/Input_EOT.java svneol=native#text/plain -src/Input_FirstStrikeDamage.java -text svneol=native#text/plain -src/Input_Main.java svneol=native#text/plain -src/Input_Mulligan.java svneol=native#text/plain -src/Input_NoCost_TapAbility.java svneol=native#text/plain -src/Input_PayManaCost.java svneol=native#text/plain -src/Input_PayManaCostUtil.java svneol=native#text/plain -src/Input_PayManaCost_Ability.java svneol=native#text/plain -src/Input_StackNotEmpty.java svneol=native#text/plain -src/Input_Untap.java svneol=native#text/plain -src/KeyListenerTest.java -text svneol=native#text/plain -src/MagicStack.java svneol=native#text/plain -src/ManaCost.java svneol=native#text/plain -src/ManaPool.java svneol=native#text/plain -src/Mana_Part.java svneol=native#text/plain -src/Mana_PartColor.java svneol=native#text/plain -src/Mana_PartColorless.java svneol=native#text/plain -src/Mana_PartSplit.java svneol=native#text/plain -src/Mana_PartTest.java svneol=native#text/plain -src/Mana_PayCost.java svneol=native#text/plain -src/MenuItem_HowToPlay.java svneol=native#text/plain -src/Move.java svneol=native#text/plain -src/MoveAttack.java svneol=native#text/plain -src/MyButton.java svneol=native#text/plain -src/MyObservable.java svneol=native#text/plain -src/MyRandom.java svneol=native#text/plain -src/NameChanger.java svneol=native#text/plain -src/NewIO.java svneol=native#text/plain -src/NonScrollingJEditorPane.java -text svneol=native#text/plain -src/Phase.java svneol=native#text/plain -src/PhaseObserver.java svneol=native#text/plain -src/PicturePanel.java svneol=native#text/plain -src/PlayerLife.java svneol=native#text/plain -src/PlayerZone.java svneol=native#text/plain -src/PlayerZoneUtil.java svneol=native#text/plain -src/PlayerZone_ComesIntoPlay.java svneol=native#text/plain -src/PrintCardNames.java svneol=native#text/plain -src/PrintCardPictures.java svneol=native#text/plain -src/QuestData.java svneol=native#text/plain -src/QuestData_BoosterPack.java svneol=native#text/plain -src/ReadBoosterPack.java svneol=native#text/plain -src/ReadCard.java svneol=native#text/plain -src/Run.java svneol=native#text/plain -src/RunTest.java svneol=native#text/plain -src/SimpleCombat.java svneol=native#text/plain -src/Spell.java svneol=native#text/plain -src/SpellAbility.java -text svneol=native#text/plain -src/SpellAbilityList.java svneol=native#text/plain -src/SpellAbilityUtil.java svneol=native#text/plain -src/Spell_Evoke.java svneol=native#text/plain -src/Spell_Permanent.java svneol=native#text/plain -src/StackObserver.java svneol=native#text/plain -src/StateBasedEffects.java -text svneol=native#text/plain -src/TableModel.java -text svneol=native#text/plain -src/TableSorter.java svneol=native#text/plain -src/TempRun.java svneol=native#text/plain -src/Test.java svneol=native#text/plain -src/TestMove.java svneol=native#text/plain -src/TestPanel.java svneol=native#text/plain -src/Time.java svneol=native#text/plain -src/UndoCommand.java svneol=native#text/plain -src/Wait.java svneol=native#text/plain -src/WinLose.java svneol=native#text/plain +src/QuestData_State.java svneol=native#text/plain +src/forge/Ability.java svneol=native#text/plain +src/forge/Ability_Activated.java svneol=native#text/plain +src/forge/Ability_Hand.java svneol=native#text/plain +src/forge/Ability_Mana.java -text svneol=native#text/plain +src/forge/Ability_Tap.java svneol=native#text/plain +src/forge/All.java svneol=native#text/plain +src/forge/AllZone.java svneol=native#text/plain +src/forge/BackgroundPanel.java -text svneol=native#text/plain +src/forge/BoosterDraft.java svneol=native#text/plain +src/forge/BoosterDraftAI.java svneol=native#text/plain +src/forge/BoosterPack.java svneol=native#text/plain +src/forge/ButtonUtil.java svneol=native#text/plain +src/forge/Card.java svneol=native#text/plain +src/forge/CardDetailUtil.java svneol=native#text/plain +src/forge/CardFactory.java svneol=native#text/plain +src/forge/CardFactoryUtil.java svneol=native#text/plain +src/forge/CardFactory_Auras.java -text svneol=native#text/plain +src/forge/CardFactory_Creatures.java -text svneol=native#text/plain +src/forge/CardFactory_Equipment.java -text svneol=native#text/plain +src/forge/CardFactory_Lands.java -text svneol=native#text/plain +src/forge/CardFactory_Planeswalkers.java -text svneol=native#text/plain +src/forge/CardList.java svneol=native#text/plain +src/forge/CardListFilter.java svneol=native#text/plain +src/forge/CardListUtil.java svneol=native#text/plain +src/forge/CardPanel.java svneol=native#text/plain +src/forge/CardParser.java svneol=native#text/plain +src/forge/CardUtil.java svneol=native#text/plain +src/forge/Combat.java svneol=native#text/plain +src/forge/CombatPlaneswalker.java svneol=native#text/plain +src/forge/CombatUtil.java svneol=native#text/plain +src/forge/Command.java svneol=native#text/plain +src/forge/CommandArgs.java svneol=native#text/plain +src/forge/CommandList.java svneol=native#text/plain +src/forge/CommandReturn.java svneol=native#text/plain +src/forge/Computer.java svneol=native#text/plain +src/forge/ComputerAI_Burn.java svneol=native#text/plain +src/forge/ComputerAI_Burn2.java svneol=native#text/plain +src/forge/ComputerAI_General.java svneol=native#text/plain +src/forge/ComputerAI_Input.java svneol=native#text/plain +src/forge/ComputerAI_Rats2.java svneol=native#text/plain +src/forge/ComputerAI_StackNotEmpty.java svneol=native#text/plain +src/forge/ComputerAI_Testing.java svneol=native#text/plain +src/forge/ComputerAI_counterSpells.java -text svneol=native#text/plain +src/forge/ComputerUtil.java -text svneol=native#text/plain +src/forge/ComputerUtil_Attack2.java svneol=native#text/plain +src/forge/ComputerUtil_Block2.java svneol=native#text/plain +src/forge/Computer_Cleanup.java svneol=native#text/plain +src/forge/Computer_Draw.java svneol=native#text/plain +src/forge/Computer_Race.java svneol=native#text/plain +src/forge/Constant.java svneol=native#text/plain +src/forge/Deck.java svneol=native#text/plain +src/forge/DeckIO.java svneol=native#text/plain +src/forge/DefaultPlayerZone.java svneol=native#text/plain +src/forge/Display.java svneol=native#text/plain +src/forge/EndOfTurn.java svneol=native#text/plain +src/forge/ExternalPanel.java svneol=native#text/plain +src/forge/FileUtil.java -text svneol=native#text/plain +src/forge/GameAction.java svneol=native#text/plain +src/forge/GameActionUtil.java svneol=native#text/plain +src/forge/GenerateConstructedDeck.java svneol=native#text/plain +src/forge/GenerateConstructedMultiColorDeck.java -text svneol=native#text/plain +src/forge/GenerateDraftDeck.java svneol=native#text/plain +src/forge/GenerateSealedDeck.java svneol=native#text/plain +src/forge/GuiDisplay.java svneol=native#text/plain +src/forge/GuiDisplay2.java svneol=native#text/plain +src/forge/GuiDisplay3.java -text svneol=native#text/plain +src/forge/GuiDisplayUtil.java svneol=native#text/plain +src/forge/GuiInput.java svneol=native#text/plain +src/forge/Gui_BoosterDraft.java svneol=native#text/plain +src/forge/Gui_DeckEditor.java -text svneol=native#text/plain +src/forge/Gui_DeckEditorNew.java -text svneol=native#text/plain +src/forge/Gui_DeckEditor_Menu.java svneol=native#text/plain +src/forge/Gui_DownloadPictures.java svneol=native#text/plain +src/forge/Gui_MultipleBlockers.java svneol=native#text/plain +src/forge/Gui_NewGame.java svneol=native#text/plain +src/forge/Gui_Quest.java svneol=native#text/plain +src/forge/Gui_QuestOptions.java svneol=native#text/plain +src/forge/Gui_Quest_DeckEditor.java -text svneol=native#text/plain +src/forge/Gui_Quest_DeckEditor_Menu.java -text svneol=native#text/plain +src/forge/Gui_SealedDeck.java svneol=native#text/plain +src/forge/Gui_SetEditor.java svneol=native#text/plain +src/forge/Gui_Welcome.java svneol=native#text/plain +src/forge/Gui_WinLose.java svneol=native#text/plain +src/forge/IO.java svneol=native#text/plain +src/forge/ImageCache.java svneol=native#text/plain +src/forge/ImageJPanel.java -text svneol=native#text/plain +src/forge/ImageUtil.java svneol=native#text/plain +src/forge/Input.java svneol=native#text/plain +src/forge/InputControl.java svneol=native#text/plain +src/forge/InputUtil.java svneol=native#text/plain +src/forge/Input_Attack.java svneol=native#text/plain +src/forge/Input_Attack_Instant.java -text svneol=native#text/plain +src/forge/Input_Attack_Planeswalker.java svneol=native#text/plain +src/forge/Input_Before_Attack_Instant.java -text svneol=native#text/plain +src/forge/Input_Block.java svneol=native#text/plain +src/forge/Input_Block_Instant.java svneol=native#text/plain +src/forge/Input_Block_Planeswalker.java svneol=native#text/plain +src/forge/Input_Cleanup.java svneol=native#text/plain +src/forge/Input_CombatDamage.java svneol=native#text/plain +src/forge/Input_Draw.java svneol=native#text/plain +src/forge/Input_EOT.java svneol=native#text/plain +src/forge/Input_FirstStrikeDamage.java -text svneol=native#text/plain +src/forge/Input_Main.java svneol=native#text/plain +src/forge/Input_Mulligan.java svneol=native#text/plain +src/forge/Input_NoCost_TapAbility.java svneol=native#text/plain +src/forge/Input_PayManaCost.java svneol=native#text/plain +src/forge/Input_PayManaCostUtil.java svneol=native#text/plain +src/forge/Input_PayManaCost_Ability.java svneol=native#text/plain +src/forge/Input_StackNotEmpty.java svneol=native#text/plain +src/forge/Input_Untap.java svneol=native#text/plain +src/forge/KeyListenerTest.java -text svneol=native#text/plain +src/forge/MagicStack.java svneol=native#text/plain +src/forge/ManaCost.java svneol=native#text/plain +src/forge/ManaPool.java svneol=native#text/plain +src/forge/Mana_Part.java svneol=native#text/plain +src/forge/Mana_PartColor.java svneol=native#text/plain +src/forge/Mana_PartColorless.java svneol=native#text/plain +src/forge/Mana_PartSplit.java svneol=native#text/plain +src/forge/Mana_PartTest.java svneol=native#text/plain +src/forge/Mana_PayCost.java svneol=native#text/plain +src/forge/MenuItem_HowToPlay.java svneol=native#text/plain +src/forge/Move.java svneol=native#text/plain +src/forge/MoveAttack.java svneol=native#text/plain +src/forge/MyButton.java svneol=native#text/plain +src/forge/MyObservable.java svneol=native#text/plain +src/forge/MyRandom.java svneol=native#text/plain +src/forge/NameChanger.java svneol=native#text/plain +src/forge/NewIO.java svneol=native#text/plain +src/forge/NonScrollingJEditorPane.java -text svneol=native#text/plain +src/forge/Phase.java svneol=native#text/plain +src/forge/PhaseObserver.java svneol=native#text/plain +src/forge/PicturePanel.java svneol=native#text/plain +src/forge/PlayerLife.java svneol=native#text/plain +src/forge/PlayerZone.java svneol=native#text/plain +src/forge/PlayerZoneUtil.java svneol=native#text/plain +src/forge/PlayerZone_ComesIntoPlay.java svneol=native#text/plain +src/forge/PrintCardNames.java svneol=native#text/plain +src/forge/PrintCardPictures.java svneol=native#text/plain +src/forge/QuestData.java svneol=native#text/plain +src/forge/QuestData_BoosterPack.java svneol=native#text/plain +src/forge/QuestData_State.java svneol=native#text/plain +src/forge/ReadBoosterPack.java svneol=native#text/plain +src/forge/ReadCard.java svneol=native#text/plain +src/forge/Run.java svneol=native#text/plain +src/forge/RunTest.java svneol=native#text/plain +src/forge/SimpleCombat.java svneol=native#text/plain +src/forge/Spell.java svneol=native#text/plain +src/forge/SpellAbility.java -text svneol=native#text/plain +src/forge/SpellAbilityList.java svneol=native#text/plain +src/forge/SpellAbilityUtil.java svneol=native#text/plain +src/forge/Spell_Evoke.java svneol=native#text/plain +src/forge/Spell_Permanent.java svneol=native#text/plain +src/forge/StackObserver.java svneol=native#text/plain +src/forge/StateBasedEffects.java -text svneol=native#text/plain +src/forge/TableModel.java -text svneol=native#text/plain +src/forge/TableSorter.java svneol=native#text/plain +src/forge/TempRun.java svneol=native#text/plain +src/forge/Test.java svneol=native#text/plain +src/forge/TestMove.java svneol=native#text/plain +src/forge/TestPanel.java svneol=native#text/plain +src/forge/Time.java svneol=native#text/plain +src/forge/UndoCommand.java svneol=native#text/plain +src/forge/Wait.java svneol=native#text/plain +src/forge/WinLose.java svneol=native#text/plain src/forge/error/ErrorViewer.java svneol=native#text/plain src/forge/error/ExceptionHandler.java -text svneol=native#text/plain src/forge/gui/ForgeAction.java svneol=native#text/plain diff --git a/src/Deck.java b/src/Deck.java index f1dd7e27310..417ce7be5c0 100644 --- a/src/Deck.java +++ b/src/Deck.java @@ -1,76 +1,44 @@ -import java.util.*; +import java.io.ObjectStreamException; +import java.io.Serializable; +import java.util.ArrayList; -public class Deck implements java.io.Serializable -{ - private static final long serialVersionUID = -2188987217361601903L; - //gameType is from Constant.GameType, like Constant.GameType.Regular - private String deckType; +/** + * Deck.java + * + * Created on 26.10.2009 + */ - private boolean isRegular; - private boolean isSealed; - private boolean isDraft; - private ArrayList main = new ArrayList(); - private ArrayList sideboard = new ArrayList(); - - //very important, do NOT change this - private String name = ""; - - //gameType is from Constant.GameType, like Constant.GameType.Regular - public Deck(String gameType) - { - deckType = gameType; - setDeckType(gameType); - } - public String getDeckType() {return deckType;} - - //can only call this method ONCE - private final void setDeckType(String deckType) - { - if(isRegular || isSealed || isDraft) - throw new RuntimeException("Deck : setDeckType() error, deck type has already been set"); - - if(deckType.equals(Constant.GameType.Constructed)) - isRegular = true; - else if(deckType.equals(Constant.GameType.Sealed)) - isSealed = true; - else if(deckType.equals(Constant.GameType.Draft)) - isDraft = true; - else - throw new RuntimeException("Deck : setDeckType() error, invalid deck type - " +deckType); - } - - public void setName(String s) {name = s;} - public String getName() {return name;}//may return null - - public void addMain(String cardName) {main.add(cardName);} - public int countMain() {return main.size();} - public String getMain(int index) {return main.get(index).toString();} - public String removeMain(int index) {return main.remove(index).toString();} - - public void addSideboard(String cardName) {sideboard.add(cardName);} - public int countSideboard() {return sideboard.size();} - public String getSideboard(int index) {return sideboard.get(index).toString();} - public String removeSideboard(int index) {return sideboard.remove(index).toString();} - - public boolean isDraft() {return isDraft;} - public boolean isSealed() {return isSealed;} - public boolean isRegular() {return isRegular;} - - public int hashcode() {return getName().hashCode();} - public String toString() {return getName();} -} - - - -class DeckSort implements Comparator -{ - public int compare(Object a, Object b) - { - String a1 = ((Deck)a).getName(); - String b1 = ((Deck)b).getName(); - - return a1.compareTo(b1); - } +/** + * The class Deck. This class is only here for compatibility with forge versions 10/17 and older. When it is read + * from the file stream, the object is replaced with an object of type {@link Deck} using {@link #readResolve()}. + * + * @author Clemens Koza + */ +public class Deck implements Serializable { + private static final long serialVersionUID = -2188987217361601903L; + + private String deckType; + + private boolean isRegular; + private boolean isSealed; + private boolean isDraft; + + private ArrayList main = new ArrayList(); + private ArrayList sideboard = new ArrayList(); + + //very important, do NOT change this + private String name = ""; + + private Object readResolve() throws ObjectStreamException { + System.out.println("resolving obsolete Deck"); + forge.Deck d = new forge.Deck(deckType); + d.setName(name); + for(String s:main) + d.addMain(s); + for(String s:sideboard) + d.addSideboard(s); + return d; + } } diff --git a/src/QuestData_State.java b/src/QuestData_State.java new file mode 100644 index 00000000000..7de2c519a94 --- /dev/null +++ b/src/QuestData_State.java @@ -0,0 +1,39 @@ +/** + * QuestData_State.java + * + * Created on 26.10.2009 + */ + +import java.io.ObjectStreamException; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashMap; + + +/** + * The class QuestData_State. This class is only here for compatibility with forge versions 10/17 and older. When + * it is read from the file stream, the object is replaced with an object of type {@link Deck} using + * {@link #readResolve()}. + * + * @author Clemens Koza + */ +public class QuestData_State implements Serializable { + private static final long serialVersionUID = 7007940230351051937L; + + int rankIndex, win, lost; + String difficulty; + + ArrayList cardPool; + HashMap myDecks, aiDecks; + + @SuppressWarnings("unchecked") + private Object readResolve() throws ObjectStreamException { + System.out.println("resolving obsolete QuestData_State"); + //removing generic types to make cast between Deck and forge.Deck + //i'm using Deck in this class because it may be somewhere in the serialization stream + //it is irrelevant, because readResolve replaces Deck by forge.Deck, and since generics + //aren't checked at runtime, the cast is ok. + return new forge.QuestData_State(rankIndex, win, lost, difficulty, cardPool, (HashMap) myDecks, + (HashMap) aiDecks); + } +} diff --git a/src/Ability.java b/src/forge/Ability.java similarity index 97% rename from src/Ability.java rename to src/forge/Ability.java index 8899c56f58b..7963616bcab 100644 --- a/src/Ability.java +++ b/src/forge/Ability.java @@ -1,3 +1,4 @@ +package forge; abstract public class Ability extends SpellAbility { public Ability(Card sourceCard, String manaCost) diff --git a/src/Ability_Activated.java b/src/forge/Ability_Activated.java similarity index 97% rename from src/Ability_Activated.java rename to src/forge/Ability_Activated.java index 2746ecca904..961e0da7236 100644 --- a/src/Ability_Activated.java +++ b/src/forge/Ability_Activated.java @@ -1,3 +1,4 @@ +package forge; abstract public class Ability_Activated extends SpellAbility implements java.io.Serializable { /** diff --git a/src/Ability_Hand.java b/src/forge/Ability_Hand.java similarity index 97% rename from src/Ability_Hand.java rename to src/forge/Ability_Hand.java index 35a3dbebf77..5d72b25f378 100644 --- a/src/Ability_Hand.java +++ b/src/forge/Ability_Hand.java @@ -1,3 +1,4 @@ +package forge; //TODO: make this class a type of Ability abstract public class Ability_Hand extends SpellAbility implements java.io.Serializable { diff --git a/src/Ability_Mana.java b/src/forge/Ability_Mana.java similarity index 97% rename from src/Ability_Mana.java rename to src/forge/Ability_Mana.java index 2c45cc8d6b5..7f6e6173701 100644 --- a/src/Ability_Mana.java +++ b/src/forge/Ability_Mana.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; abstract public class Ability_Mana extends SpellAbility implements java.io.Serializable diff --git a/src/Ability_Tap.java b/src/forge/Ability_Tap.java similarity index 98% rename from src/Ability_Tap.java rename to src/forge/Ability_Tap.java index e1924fdf871..8e36bd9bed4 100644 --- a/src/Ability_Tap.java +++ b/src/forge/Ability_Tap.java @@ -1,3 +1,4 @@ +package forge; abstract public class Ability_Tap extends SpellAbility implements java.io.Serializable { diff --git a/src/All.java b/src/forge/All.java similarity index 99% rename from src/All.java rename to src/forge/All.java index 5faa60f70bc..9af17901999 100644 --- a/src/All.java +++ b/src/forge/All.java @@ -1,3 +1,4 @@ +package forge; public class All { public Phase Phase = new Phase(); diff --git a/src/AllZone.java b/src/forge/AllZone.java similarity index 99% rename from src/AllZone.java rename to src/forge/AllZone.java index ef6057851ef..42ab7b7288b 100644 --- a/src/AllZone.java +++ b/src/forge/AllZone.java @@ -1,3 +1,4 @@ +package forge; import java.util.HashMap; diff --git a/src/BackgroundPanel.java b/src/forge/BackgroundPanel.java similarity index 95% rename from src/BackgroundPanel.java rename to src/forge/BackgroundPanel.java index 5dd508b5ae1..d383968b055 100644 --- a/src/BackgroundPanel.java +++ b/src/forge/BackgroundPanel.java @@ -1,3 +1,4 @@ +package forge; import java.awt.*; import javax.swing.*; diff --git a/src/BoosterDraft.java b/src/forge/BoosterDraft.java similarity index 99% rename from src/BoosterDraft.java rename to src/forge/BoosterDraft.java index e11e6899d10..53b413af10f 100644 --- a/src/BoosterDraft.java +++ b/src/forge/BoosterDraft.java @@ -1,3 +1,4 @@ +package forge; public interface BoosterDraft diff --git a/src/BoosterDraftAI.java b/src/forge/BoosterDraftAI.java similarity index 99% rename from src/BoosterDraftAI.java rename to src/forge/BoosterDraftAI.java index 7f10445c0bf..f6b28327526 100644 --- a/src/BoosterDraftAI.java +++ b/src/forge/BoosterDraftAI.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class BoosterDraftAI diff --git a/src/BoosterPack.java b/src/forge/BoosterPack.java similarity index 97% rename from src/BoosterPack.java rename to src/forge/BoosterPack.java index 9df679ed4e3..44aa87de58d 100644 --- a/src/BoosterPack.java +++ b/src/forge/BoosterPack.java @@ -1,3 +1,4 @@ +package forge; public class BoosterPack diff --git a/src/ButtonUtil.java b/src/forge/ButtonUtil.java similarity index 98% rename from src/ButtonUtil.java rename to src/forge/ButtonUtil.java index 1debb07c8bf..15def57b23c 100644 --- a/src/ButtonUtil.java +++ b/src/forge/ButtonUtil.java @@ -1,3 +1,4 @@ +package forge; public class ButtonUtil { public static void reset() diff --git a/src/Card.java b/src/forge/Card.java similarity index 99% rename from src/Card.java rename to src/forge/Card.java index 4e807e86370..f779dbf0a18 100644 --- a/src/Card.java +++ b/src/forge/Card.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; enum Counters { diff --git a/src/CardDetailUtil.java b/src/forge/CardDetailUtil.java similarity index 98% rename from src/CardDetailUtil.java rename to src/forge/CardDetailUtil.java index 10e1eb87086..472da299b21 100644 --- a/src/CardDetailUtil.java +++ b/src/forge/CardDetailUtil.java @@ -1,3 +1,4 @@ +package forge; import javax.swing.*; interface CardDetail diff --git a/src/CardFactory.java b/src/forge/CardFactory.java similarity index 99% rename from src/CardFactory.java rename to src/forge/CardFactory.java index d8f8cfe0fc6..2a78a77eae9 100644 --- a/src/CardFactory.java +++ b/src/forge/CardFactory.java @@ -1,3 +1,4 @@ +package forge; import java.io.File; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/CardFactoryUtil.java b/src/forge/CardFactoryUtil.java similarity index 99% rename from src/CardFactoryUtil.java rename to src/forge/CardFactoryUtil.java index 84337d3fcf7..b1e9f814dc6 100644 --- a/src/CardFactoryUtil.java +++ b/src/forge/CardFactoryUtil.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class CardFactoryUtil diff --git a/src/CardFactory_Auras.java b/src/forge/CardFactory_Auras.java similarity index 96% rename from src/CardFactory_Auras.java rename to src/forge/CardFactory_Auras.java index d41cbcd09d6..881f843eb31 100644 --- a/src/CardFactory_Auras.java +++ b/src/forge/CardFactory_Auras.java @@ -1,3 +1,4 @@ +package forge; class CardFactory_Auras { public static Card getCard(final Card card, String cardName, String owner) { diff --git a/src/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java similarity index 97% rename from src/CardFactory_Creatures.java rename to src/forge/CardFactory_Creatures.java index 2123bb29051..7852fa9559b 100644 --- a/src/CardFactory_Creatures.java +++ b/src/forge/CardFactory_Creatures.java @@ -1,3 +1,4 @@ +package forge; import java.util.ArrayList; diff --git a/src/CardFactory_Equipment.java b/src/forge/CardFactory_Equipment.java similarity index 96% rename from src/CardFactory_Equipment.java rename to src/forge/CardFactory_Equipment.java index 36ff479948e..0e42a36e086 100644 --- a/src/CardFactory_Equipment.java +++ b/src/forge/CardFactory_Equipment.java @@ -1,3 +1,4 @@ +package forge; class CardFactory_Equipment { public static Card getCard(final Card card, String cardName, String owner) { diff --git a/src/CardFactory_Lands.java b/src/forge/CardFactory_Lands.java similarity index 97% rename from src/CardFactory_Lands.java rename to src/forge/CardFactory_Lands.java index 6fddf591b4a..145474eb3e6 100644 --- a/src/CardFactory_Lands.java +++ b/src/forge/CardFactory_Lands.java @@ -1,3 +1,4 @@ +package forge; class CardFactory_Lands { public static Card getCard(final Card card, String cardName, String owner) { diff --git a/src/CardFactory_Planeswalkers.java b/src/forge/CardFactory_Planeswalkers.java similarity index 97% rename from src/CardFactory_Planeswalkers.java rename to src/forge/CardFactory_Planeswalkers.java index 7412f49f3b8..a078a0375b7 100644 --- a/src/CardFactory_Planeswalkers.java +++ b/src/forge/CardFactory_Planeswalkers.java @@ -1,3 +1,4 @@ +package forge; class CardFactory_Planeswalkers { public static Card getCard(final Card card, String cardName, String owner) { diff --git a/src/CardList.java b/src/forge/CardList.java similarity index 99% rename from src/CardList.java rename to src/forge/CardList.java index 56518e055f3..621f5e3e865 100644 --- a/src/CardList.java +++ b/src/forge/CardList.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class CardList implements Iterable diff --git a/src/CardListFilter.java b/src/forge/CardListFilter.java similarity index 82% rename from src/CardListFilter.java rename to src/forge/CardListFilter.java index 0ba3aa2f3e5..b1fb0cf61b2 100644 --- a/src/CardListFilter.java +++ b/src/forge/CardListFilter.java @@ -1,3 +1,4 @@ +package forge; public interface CardListFilter { public boolean addCard(Card c); diff --git a/src/CardListUtil.java b/src/forge/CardListUtil.java similarity index 99% rename from src/CardListUtil.java rename to src/forge/CardListUtil.java index fadaf89f1d9..48f3ddef0b2 100644 --- a/src/CardListUtil.java +++ b/src/forge/CardListUtil.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class CardListUtil diff --git a/src/CardPanel.java b/src/forge/CardPanel.java similarity index 95% rename from src/CardPanel.java rename to src/forge/CardPanel.java index 949422e2951..4df9b83c76e 100644 --- a/src/CardPanel.java +++ b/src/forge/CardPanel.java @@ -1,3 +1,4 @@ +package forge; import javax.swing.*; public class CardPanel extends JPanel diff --git a/src/CardParser.java b/src/forge/CardParser.java similarity index 99% rename from src/CardParser.java rename to src/forge/CardParser.java index 6b8126fd0ad..e32d84170c1 100644 --- a/src/CardParser.java +++ b/src/forge/CardParser.java @@ -1,3 +1,4 @@ +package forge; import java.io.*; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/src/CardUtil.java b/src/forge/CardUtil.java similarity index 99% rename from src/CardUtil.java rename to src/forge/CardUtil.java index 69fb1c88d20..597b31dc9f8 100644 --- a/src/CardUtil.java +++ b/src/forge/CardUtil.java @@ -1,3 +1,4 @@ +package forge; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; diff --git a/src/Combat.java b/src/forge/Combat.java similarity index 99% rename from src/Combat.java rename to src/forge/Combat.java index 4aa94b623f8..a399848c74b 100644 --- a/src/Combat.java +++ b/src/forge/Combat.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class Combat diff --git a/src/CombatPlaneswalker.java b/src/forge/CombatPlaneswalker.java similarity index 99% rename from src/CombatPlaneswalker.java rename to src/forge/CombatPlaneswalker.java index 4c09c139b8f..08c5e06c01b 100644 --- a/src/CombatPlaneswalker.java +++ b/src/forge/CombatPlaneswalker.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class CombatPlaneswalker diff --git a/src/CombatUtil.java b/src/forge/CombatUtil.java similarity index 99% rename from src/CombatUtil.java rename to src/forge/CombatUtil.java index e87a1779d06..3ce52b6e1bf 100644 --- a/src/CombatUtil.java +++ b/src/forge/CombatUtil.java @@ -1,3 +1,4 @@ +package forge; import java.util.ArrayList; public class CombatUtil diff --git a/src/Command.java b/src/forge/Command.java similarity index 94% rename from src/Command.java rename to src/forge/Command.java index def78853c69..b7c283d3d1f 100644 --- a/src/Command.java +++ b/src/forge/Command.java @@ -1,3 +1,4 @@ +package forge; public interface Command extends java.io.Serializable { public static Command Blank = new Command() { diff --git a/src/CommandArgs.java b/src/forge/CommandArgs.java similarity index 86% rename from src/CommandArgs.java rename to src/forge/CommandArgs.java index 5de67d3dcad..784134b53bc 100644 --- a/src/CommandArgs.java +++ b/src/forge/CommandArgs.java @@ -1,3 +1,4 @@ +package forge; public interface CommandArgs extends java.io.Serializable { public void execute(Object o); diff --git a/src/CommandList.java b/src/forge/CommandList.java similarity index 98% rename from src/CommandList.java rename to src/forge/CommandList.java index dc46c2dacc1..bdd3292f4ad 100644 --- a/src/CommandList.java +++ b/src/forge/CommandList.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class CommandList implements java.io.Serializable, Command, Iterable diff --git a/src/CommandReturn.java b/src/forge/CommandReturn.java similarity index 80% rename from src/CommandReturn.java rename to src/forge/CommandReturn.java index 16548fff7f0..809aa0cd1ce 100644 --- a/src/CommandReturn.java +++ b/src/forge/CommandReturn.java @@ -1,3 +1,4 @@ +package forge; public interface CommandReturn { public Object execute(); diff --git a/src/Computer.java b/src/forge/Computer.java similarity index 97% rename from src/Computer.java rename to src/forge/Computer.java index d50743b402d..17b88799dd6 100644 --- a/src/Computer.java +++ b/src/forge/Computer.java @@ -1,3 +1,4 @@ +package forge; public interface Computer { //must shuffle this diff --git a/src/ComputerAI_Burn.java b/src/forge/ComputerAI_Burn.java similarity index 99% rename from src/ComputerAI_Burn.java rename to src/forge/ComputerAI_Burn.java index d28e7ac78a1..0197de545a3 100644 --- a/src/ComputerAI_Burn.java +++ b/src/forge/ComputerAI_Burn.java @@ -1,3 +1,4 @@ +package forge; //import java.util.*; diff --git a/src/ComputerAI_Burn2.java b/src/forge/ComputerAI_Burn2.java similarity index 99% rename from src/ComputerAI_Burn2.java rename to src/forge/ComputerAI_Burn2.java index 8c3a094c4ed..3a26613e30e 100644 --- a/src/ComputerAI_Burn2.java +++ b/src/forge/ComputerAI_Burn2.java @@ -1,3 +1,4 @@ +package forge; //import java.util.*; import javax.swing.SwingUtilities; diff --git a/src/ComputerAI_General.java b/src/forge/ComputerAI_General.java similarity index 99% rename from src/ComputerAI_General.java rename to src/forge/ComputerAI_General.java index 297dcbb7eb8..ec5ab4076a1 100644 --- a/src/ComputerAI_General.java +++ b/src/forge/ComputerAI_General.java @@ -1,3 +1,4 @@ +package forge; import static forge.error.ErrorViewer.*; import java.util.ArrayList; diff --git a/src/ComputerAI_Input.java b/src/forge/ComputerAI_Input.java similarity index 99% rename from src/ComputerAI_Input.java rename to src/forge/ComputerAI_Input.java index 97d3498006f..d9e87b53aeb 100644 --- a/src/ComputerAI_Input.java +++ b/src/forge/ComputerAI_Input.java @@ -1,3 +1,4 @@ +package forge; public class ComputerAI_Input extends Input { private static final long serialVersionUID = -3091338639571662216L; diff --git a/src/ComputerAI_Rats2.java b/src/forge/ComputerAI_Rats2.java similarity index 99% rename from src/ComputerAI_Rats2.java rename to src/forge/ComputerAI_Rats2.java index cb2dee9b1e3..d5ad69ef1b3 100644 --- a/src/ComputerAI_Rats2.java +++ b/src/forge/ComputerAI_Rats2.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class ComputerAI_Rats2 implements Computer diff --git a/src/ComputerAI_StackNotEmpty.java b/src/forge/ComputerAI_StackNotEmpty.java similarity index 95% rename from src/ComputerAI_StackNotEmpty.java rename to src/forge/ComputerAI_StackNotEmpty.java index b53ff63f3bd..cc2575032d8 100644 --- a/src/ComputerAI_StackNotEmpty.java +++ b/src/forge/ComputerAI_StackNotEmpty.java @@ -1,3 +1,4 @@ +package forge; public class ComputerAI_StackNotEmpty extends Input { private static final long serialVersionUID = -3995969852275185353L; diff --git a/src/ComputerAI_Testing.java b/src/forge/ComputerAI_Testing.java similarity index 99% rename from src/ComputerAI_Testing.java rename to src/forge/ComputerAI_Testing.java index 568400f00b7..ca70400b409 100644 --- a/src/ComputerAI_Testing.java +++ b/src/forge/ComputerAI_Testing.java @@ -1,3 +1,4 @@ +package forge; public class ComputerAI_Testing implements Computer { diff --git a/src/ComputerAI_counterSpells.java b/src/forge/ComputerAI_counterSpells.java similarity index 96% rename from src/ComputerAI_counterSpells.java rename to src/forge/ComputerAI_counterSpells.java index 53162720601..56dfc85cb97 100644 --- a/src/ComputerAI_counterSpells.java +++ b/src/forge/ComputerAI_counterSpells.java @@ -1,3 +1,4 @@ +package forge; public class ComputerAI_counterSpells { diff --git a/src/ComputerUtil.java b/src/forge/ComputerUtil.java similarity index 96% rename from src/ComputerUtil.java rename to src/forge/ComputerUtil.java index 34c63d8a4c8..11b3c86795e 100644 --- a/src/ComputerUtil.java +++ b/src/forge/ComputerUtil.java @@ -1,3 +1,4 @@ +package forge; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; diff --git a/src/ComputerUtil_Attack2.java b/src/forge/ComputerUtil_Attack2.java similarity index 99% rename from src/ComputerUtil_Attack2.java rename to src/forge/ComputerUtil_Attack2.java index b513fb85a8f..a15046335b4 100644 --- a/src/ComputerUtil_Attack2.java +++ b/src/forge/ComputerUtil_Attack2.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; //doesHumanAttackAndWin() uses the global variable AllZone.Computer_Life diff --git a/src/ComputerUtil_Block2.java b/src/forge/ComputerUtil_Block2.java similarity index 99% rename from src/ComputerUtil_Block2.java rename to src/forge/ComputerUtil_Block2.java index 459a228e675..14e9b412b05 100644 --- a/src/ComputerUtil_Block2.java +++ b/src/forge/ComputerUtil_Block2.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class ComputerUtil_Block2 diff --git a/src/Computer_Cleanup.java b/src/forge/Computer_Cleanup.java similarity index 97% rename from src/Computer_Cleanup.java rename to src/forge/Computer_Cleanup.java index c73cc394e85..eeea0158c28 100644 --- a/src/Computer_Cleanup.java +++ b/src/forge/Computer_Cleanup.java @@ -1,3 +1,4 @@ +package forge; import java.util.Random; public class Computer_Cleanup extends Input diff --git a/src/Computer_Draw.java b/src/forge/Computer_Draw.java similarity index 96% rename from src/Computer_Draw.java rename to src/forge/Computer_Draw.java index c6ade7a2b64..180c4c90458 100644 --- a/src/Computer_Draw.java +++ b/src/forge/Computer_Draw.java @@ -1,3 +1,4 @@ +package forge; public class Computer_Draw extends Input { private static final long serialVersionUID = -815953053902719496L; diff --git a/src/Computer_Race.java b/src/forge/Computer_Race.java similarity index 99% rename from src/Computer_Race.java rename to src/forge/Computer_Race.java index 4106cfc154b..1c3a578b1f1 100644 --- a/src/Computer_Race.java +++ b/src/forge/Computer_Race.java @@ -1,3 +1,4 @@ +package forge; public class Computer_Race { public boolean willWinRace(CardList attackList, int attackLife, CardList blockList, int blockLife) diff --git a/src/Constant.java b/src/forge/Constant.java similarity index 99% rename from src/Constant.java rename to src/forge/Constant.java index d02e8a5c622..34debd43306 100644 --- a/src/Constant.java +++ b/src/forge/Constant.java @@ -1,3 +1,4 @@ +package forge; import javax.swing.ImageIcon; public interface Constant diff --git a/src/forge/Deck.java b/src/forge/Deck.java new file mode 100644 index 00000000000..0e8d58a2184 --- /dev/null +++ b/src/forge/Deck.java @@ -0,0 +1,115 @@ +package forge; + + + + +import java.util.*; + + +public class Deck implements java.io.Serializable { + private static final long serialVersionUID = -2188987217361601903L; + + //gameType is from Constant.GameType, like Constant.GameType.Regular + private String deckType; + + private boolean isRegular; + private boolean isSealed; + private boolean isDraft; + + private ArrayList main = new ArrayList(); + private ArrayList sideboard = new ArrayList(); + + //very important, do NOT change this + private String name = ""; + + //gameType is from Constant.GameType, like Constant.GameType.Regular + public Deck(String gameType) { + deckType = gameType; + setDeckType(gameType); + } + + public String getDeckType() { + return deckType; + } + + //can only call this method ONCE + private final void setDeckType(String deckType) { + if(isRegular || isSealed || isDraft) throw new RuntimeException( + "Deck : setDeckType() error, deck type has already been set"); + + if(deckType.equals(Constant.GameType.Constructed)) isRegular = true; + else if(deckType.equals(Constant.GameType.Sealed)) isSealed = true; + else if(deckType.equals(Constant.GameType.Draft)) isDraft = true; + else throw new RuntimeException("Deck : setDeckType() error, invalid deck type - " + deckType); + } + + public void setName(String s) { + name = s; + } + + public String getName() { + return name; + }//may return null + + public void addMain(String cardName) { + main.add(cardName); + } + + public int countMain() { + return main.size(); + } + + public String getMain(int index) { + return main.get(index).toString(); + } + + public String removeMain(int index) { + return main.remove(index).toString(); + } + + public void addSideboard(String cardName) { + sideboard.add(cardName); + } + + public int countSideboard() { + return sideboard.size(); + } + + public String getSideboard(int index) { + return sideboard.get(index).toString(); + } + + public String removeSideboard(int index) { + return sideboard.remove(index).toString(); + } + + public boolean isDraft() { + return isDraft; + } + + public boolean isSealed() { + return isSealed; + } + + public boolean isRegular() { + return isRegular; + } + + public int hashcode() { + return getName().hashCode(); + } + + public String toString() { + return getName(); + } +} + + +class DeckSort implements Comparator { + public int compare(Object a, Object b) { + String a1 = ((Deck) a).getName(); + String b1 = ((Deck) b).getName(); + + return a1.compareTo(b1); + } +} diff --git a/src/DeckIO.java b/src/forge/DeckIO.java similarity index 99% rename from src/DeckIO.java rename to src/forge/DeckIO.java index c44a0410a3f..85518beb70b 100644 --- a/src/DeckIO.java +++ b/src/forge/DeckIO.java @@ -1,3 +1,4 @@ +package forge; diff --git a/src/DefaultPlayerZone.java b/src/forge/DefaultPlayerZone.java similarity index 99% rename from src/DefaultPlayerZone.java rename to src/forge/DefaultPlayerZone.java index b45e6d6f406..79b6e799f6e 100644 --- a/src/DefaultPlayerZone.java +++ b/src/forge/DefaultPlayerZone.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class DefaultPlayerZone extends PlayerZone implements java.io.Serializable diff --git a/src/Display.java b/src/forge/Display.java similarity index 97% rename from src/Display.java rename to src/forge/Display.java index 4164e6f4a8a..3336051f2bf 100644 --- a/src/Display.java +++ b/src/forge/Display.java @@ -1,3 +1,4 @@ +package forge; public interface Display { public T getChoice(String message, T[] choices); diff --git a/src/EndOfTurn.java b/src/forge/EndOfTurn.java similarity index 99% rename from src/EndOfTurn.java rename to src/forge/EndOfTurn.java index 87be86eec34..18a2cbd0d08 100644 --- a/src/EndOfTurn.java +++ b/src/forge/EndOfTurn.java @@ -1,3 +1,4 @@ +package forge; //import java.util.*; //handles "until end of turn" and "at end of turn" commands from cards diff --git a/src/ExternalPanel.java b/src/forge/ExternalPanel.java similarity index 99% rename from src/ExternalPanel.java rename to src/forge/ExternalPanel.java index 08869bb364d..acac0370010 100644 --- a/src/ExternalPanel.java +++ b/src/forge/ExternalPanel.java @@ -1,3 +1,4 @@ +package forge; import java.awt.BorderLayout; import java.awt.Component; import java.awt.Dimension; diff --git a/src/FileUtil.java b/src/forge/FileUtil.java similarity index 96% rename from src/FileUtil.java rename to src/forge/FileUtil.java index 3aefb7febaa..58ee438ad2f 100644 --- a/src/FileUtil.java +++ b/src/forge/FileUtil.java @@ -1,3 +1,4 @@ +package forge; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; diff --git a/src/GameAction.java b/src/forge/GameAction.java similarity index 99% rename from src/GameAction.java rename to src/forge/GameAction.java index 484a7a00f05..f08b6ebbf80 100644 --- a/src/GameAction.java +++ b/src/forge/GameAction.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; import javax.swing.*; diff --git a/src/GameActionUtil.java b/src/forge/GameActionUtil.java similarity index 99% rename from src/GameActionUtil.java rename to src/forge/GameActionUtil.java index 54b50438ec0..6c5d7832cdf 100644 --- a/src/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class GameActionUtil diff --git a/src/GenerateConstructedDeck.java b/src/forge/GenerateConstructedDeck.java similarity index 99% rename from src/GenerateConstructedDeck.java rename to src/forge/GenerateConstructedDeck.java index 0149be111d7..19f999b7d43 100644 --- a/src/GenerateConstructedDeck.java +++ b/src/forge/GenerateConstructedDeck.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class GenerateConstructedDeck diff --git a/src/GenerateConstructedMultiColorDeck.java b/src/forge/GenerateConstructedMultiColorDeck.java similarity index 96% rename from src/GenerateConstructedMultiColorDeck.java rename to src/forge/GenerateConstructedMultiColorDeck.java index 7bb4bd886f4..062b4b88baa 100644 --- a/src/GenerateConstructedMultiColorDeck.java +++ b/src/forge/GenerateConstructedMultiColorDeck.java @@ -1,3 +1,4 @@ +package forge; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; diff --git a/src/GenerateDraftDeck.java b/src/forge/GenerateDraftDeck.java similarity index 99% rename from src/GenerateDraftDeck.java rename to src/forge/GenerateDraftDeck.java index 3d593316765..a8b5b9900da 100644 --- a/src/GenerateDraftDeck.java +++ b/src/forge/GenerateDraftDeck.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class GenerateDraftDeck diff --git a/src/GenerateSealedDeck.java b/src/forge/GenerateSealedDeck.java similarity index 99% rename from src/GenerateSealedDeck.java rename to src/forge/GenerateSealedDeck.java index d398b928bc6..609a1701f5d 100644 --- a/src/GenerateSealedDeck.java +++ b/src/forge/GenerateSealedDeck.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class GenerateSealedDeck diff --git a/src/GuiDisplay.java b/src/forge/GuiDisplay.java similarity index 99% rename from src/GuiDisplay.java rename to src/forge/GuiDisplay.java index 25da121cb9c..5900ffe4591 100644 --- a/src/GuiDisplay.java +++ b/src/forge/GuiDisplay.java @@ -1,3 +1,4 @@ +package forge; import java.awt.BorderLayout; import java.awt.Color; import java.awt.FlowLayout; diff --git a/src/GuiDisplay2.java b/src/forge/GuiDisplay2.java similarity index 99% rename from src/GuiDisplay2.java rename to src/forge/GuiDisplay2.java index 7e81301ca47..892a3ffde94 100644 --- a/src/GuiDisplay2.java +++ b/src/forge/GuiDisplay2.java @@ -1,3 +1,4 @@ +package forge; diff --git a/src/GuiDisplay3.java b/src/forge/GuiDisplay3.java similarity index 97% rename from src/GuiDisplay3.java rename to src/forge/GuiDisplay3.java index e547ee7990a..dcf0a710c68 100644 --- a/src/GuiDisplay3.java +++ b/src/forge/GuiDisplay3.java @@ -1,3 +1,4 @@ +package forge; import static org.jdesktop.swingx.MultiSplitLayout.*; diff --git a/src/GuiDisplayUtil.java b/src/forge/GuiDisplayUtil.java similarity index 99% rename from src/GuiDisplayUtil.java rename to src/forge/GuiDisplayUtil.java index f8916d5c8f9..3f8bd634aec 100644 --- a/src/GuiDisplayUtil.java +++ b/src/forge/GuiDisplayUtil.java @@ -1,3 +1,4 @@ +package forge; import java.awt.Color; import java.awt.Dimension; import java.awt.Font; diff --git a/src/GuiInput.java b/src/forge/GuiInput.java similarity index 98% rename from src/GuiInput.java rename to src/forge/GuiInput.java index 773192a9798..8f89e0a4421 100644 --- a/src/GuiInput.java +++ b/src/forge/GuiInput.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class GuiInput extends MyObservable implements Observer diff --git a/src/Gui_BoosterDraft.java b/src/forge/Gui_BoosterDraft.java similarity index 99% rename from src/Gui_BoosterDraft.java rename to src/forge/Gui_BoosterDraft.java index e6d4cc558c7..97af615b38c 100644 --- a/src/Gui_BoosterDraft.java +++ b/src/forge/Gui_BoosterDraft.java @@ -1,3 +1,4 @@ +package forge; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Frame; diff --git a/src/Gui_DeckEditor.java b/src/forge/Gui_DeckEditor.java similarity index 97% rename from src/Gui_DeckEditor.java rename to src/forge/Gui_DeckEditor.java index fa2c407fd7a..9d3fb130e96 100644 --- a/src/Gui_DeckEditor.java +++ b/src/forge/Gui_DeckEditor.java @@ -1,3 +1,4 @@ +package forge; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Font; diff --git a/src/Gui_DeckEditorNew.java b/src/forge/Gui_DeckEditorNew.java similarity index 97% rename from src/Gui_DeckEditorNew.java rename to src/forge/Gui_DeckEditorNew.java index ae963c54be1..d23a677b740 100755 --- a/src/Gui_DeckEditorNew.java +++ b/src/forge/Gui_DeckEditorNew.java @@ -1,3 +1,4 @@ +package forge; import static javax.swing.BorderFactory.*; import static org.jdesktop.swingx.MultiSplitLayout.*; diff --git a/src/Gui_DeckEditor_Menu.java b/src/forge/Gui_DeckEditor_Menu.java similarity index 99% rename from src/Gui_DeckEditor_Menu.java rename to src/forge/Gui_DeckEditor_Menu.java index 2df0c821835..2764f930b50 100644 --- a/src/Gui_DeckEditor_Menu.java +++ b/src/forge/Gui_DeckEditor_Menu.java @@ -1,3 +1,4 @@ +package forge; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; diff --git a/src/Gui_DownloadPictures.java b/src/forge/Gui_DownloadPictures.java similarity index 99% rename from src/Gui_DownloadPictures.java rename to src/forge/Gui_DownloadPictures.java index be457ef2d78..13011ecf10f 100644 --- a/src/Gui_DownloadPictures.java +++ b/src/forge/Gui_DownloadPictures.java @@ -1,3 +1,4 @@ +package forge; import static java.lang.Integer.*; import static javax.swing.JOptionPane.*; diff --git a/src/Gui_MultipleBlockers.java b/src/forge/Gui_MultipleBlockers.java similarity index 99% rename from src/Gui_MultipleBlockers.java rename to src/forge/Gui_MultipleBlockers.java index e8faa91a0d1..bf1a61abe4b 100644 --- a/src/Gui_MultipleBlockers.java +++ b/src/forge/Gui_MultipleBlockers.java @@ -1,3 +1,4 @@ +package forge; import javax.swing.*; import java.awt.*; import java.awt.event.*; diff --git a/src/Gui_NewGame.java b/src/forge/Gui_NewGame.java similarity index 99% rename from src/Gui_NewGame.java rename to src/forge/Gui_NewGame.java index 2a2453f99b6..e1abee290af 100644 --- a/src/Gui_NewGame.java +++ b/src/forge/Gui_NewGame.java @@ -1,3 +1,4 @@ +package forge; import java.awt.Color; import java.awt.Component; diff --git a/src/Gui_Quest.java b/src/forge/Gui_Quest.java similarity index 99% rename from src/Gui_Quest.java rename to src/forge/Gui_Quest.java index 30dab886326..91ccf6ac0a5 100644 --- a/src/Gui_Quest.java +++ b/src/forge/Gui_Quest.java @@ -1,3 +1,4 @@ +package forge; import java.awt.Color; import java.awt.Dimension; import java.awt.Rectangle; diff --git a/src/Gui_QuestOptions.java b/src/forge/Gui_QuestOptions.java similarity index 99% rename from src/Gui_QuestOptions.java rename to src/forge/Gui_QuestOptions.java index e60d01caf2d..20fb0b9a626 100644 --- a/src/Gui_QuestOptions.java +++ b/src/forge/Gui_QuestOptions.java @@ -1,3 +1,4 @@ +package forge; import java.awt.Color; import java.awt.Dimension; import java.awt.GridLayout; diff --git a/src/Gui_Quest_DeckEditor.java b/src/forge/Gui_Quest_DeckEditor.java similarity index 97% rename from src/Gui_Quest_DeckEditor.java rename to src/forge/Gui_Quest_DeckEditor.java index 939459f3487..120ad6ff9ce 100644 --- a/src/Gui_Quest_DeckEditor.java +++ b/src/forge/Gui_Quest_DeckEditor.java @@ -1,3 +1,4 @@ +package forge; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Font; diff --git a/src/Gui_Quest_DeckEditor_Menu.java b/src/forge/Gui_Quest_DeckEditor_Menu.java similarity index 97% rename from src/Gui_Quest_DeckEditor_Menu.java rename to src/forge/Gui_Quest_DeckEditor_Menu.java index e789a9576a3..a43277f9508 100644 --- a/src/Gui_Quest_DeckEditor_Menu.java +++ b/src/forge/Gui_Quest_DeckEditor_Menu.java @@ -1,3 +1,4 @@ +package forge; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; diff --git a/src/Gui_SealedDeck.java b/src/forge/Gui_SealedDeck.java similarity index 99% rename from src/Gui_SealedDeck.java rename to src/forge/Gui_SealedDeck.java index 3961f1fd7ff..89eabc42308 100644 --- a/src/Gui_SealedDeck.java +++ b/src/forge/Gui_SealedDeck.java @@ -1,3 +1,4 @@ +package forge; diff --git a/src/Gui_SetEditor.java b/src/forge/Gui_SetEditor.java similarity index 99% rename from src/Gui_SetEditor.java rename to src/forge/Gui_SetEditor.java index 093e4f54228..d80d9a98efb 100644 --- a/src/Gui_SetEditor.java +++ b/src/forge/Gui_SetEditor.java @@ -1,3 +1,4 @@ +package forge; import java.awt.Color; import java.awt.FlowLayout; import java.awt.Rectangle; diff --git a/src/Gui_Welcome.java b/src/forge/Gui_Welcome.java similarity index 99% rename from src/Gui_Welcome.java rename to src/forge/Gui_Welcome.java index 6dbb5626cbf..ba775d0756f 100644 --- a/src/Gui_Welcome.java +++ b/src/forge/Gui_Welcome.java @@ -1,3 +1,4 @@ +package forge; import java.awt.Rectangle; import java.awt.event.ActionEvent; diff --git a/src/Gui_WinLose.java b/src/forge/Gui_WinLose.java similarity index 99% rename from src/Gui_WinLose.java rename to src/forge/Gui_WinLose.java index bfdf3471ce9..5384da08016 100644 --- a/src/Gui_WinLose.java +++ b/src/forge/Gui_WinLose.java @@ -1,3 +1,4 @@ +package forge; import java.awt.Color; import java.awt.Dimension; import java.awt.Rectangle; diff --git a/src/IO.java b/src/forge/IO.java similarity index 99% rename from src/IO.java rename to src/forge/IO.java index 9676bb90901..515b5850b25 100644 --- a/src/IO.java +++ b/src/forge/IO.java @@ -1,3 +1,4 @@ +package forge; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; diff --git a/src/ImageCache.java b/src/forge/ImageCache.java similarity index 99% rename from src/ImageCache.java rename to src/forge/ImageCache.java index 51cf2a7fbc0..aff92fe190d 100644 --- a/src/ImageCache.java +++ b/src/forge/ImageCache.java @@ -1,3 +1,4 @@ +package forge; import java.awt.Image; import java.awt.Rectangle; import java.awt.image.BufferedImage; diff --git a/src/ImageJPanel.java b/src/forge/ImageJPanel.java similarity index 92% rename from src/ImageJPanel.java rename to src/forge/ImageJPanel.java index e4b66701a00..535999dec50 100644 --- a/src/ImageJPanel.java +++ b/src/forge/ImageJPanel.java @@ -1,3 +1,4 @@ +package forge; import java.awt.Graphics; import java.awt.Image; diff --git a/src/ImageUtil.java b/src/forge/ImageUtil.java similarity index 99% rename from src/ImageUtil.java rename to src/forge/ImageUtil.java index aa4fd3319e2..462ba609213 100644 --- a/src/ImageUtil.java +++ b/src/forge/ImageUtil.java @@ -1,3 +1,4 @@ +package forge; import java.awt.Graphics; import java.awt.Graphics2D; diff --git a/src/Input.java b/src/forge/Input.java similarity index 99% rename from src/Input.java rename to src/forge/Input.java index 794f494f290..ff6461c884a 100644 --- a/src/Input.java +++ b/src/forge/Input.java @@ -1,3 +1,4 @@ +package forge; public abstract class Input implements java.io.Serializable { private static final long serialVersionUID = -6539552513871194081L; diff --git a/src/InputControl.java b/src/forge/InputControl.java similarity index 99% rename from src/InputControl.java rename to src/forge/InputControl.java index ba70dc539cf..c926c614587 100644 --- a/src/InputControl.java +++ b/src/forge/InputControl.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; @SuppressWarnings("unused") // java.util.* diff --git a/src/InputUtil.java b/src/forge/InputUtil.java similarity index 98% rename from src/InputUtil.java rename to src/forge/InputUtil.java index 96efe2a7a2f..60701ea6135 100644 --- a/src/InputUtil.java +++ b/src/forge/InputUtil.java @@ -1,3 +1,4 @@ +package forge; //import java.util.*; //unused public class InputUtil diff --git a/src/Input_Attack.java b/src/forge/Input_Attack.java similarity index 99% rename from src/Input_Attack.java rename to src/forge/Input_Attack.java index 2fa3fa9d7ff..212bc422c50 100644 --- a/src/Input_Attack.java +++ b/src/forge/Input_Attack.java @@ -1,3 +1,4 @@ +package forge; public class Input_Attack extends Input { private static final long serialVersionUID = 7849903731842214245L; diff --git a/src/Input_Attack_Instant.java b/src/forge/Input_Attack_Instant.java similarity index 94% rename from src/Input_Attack_Instant.java rename to src/forge/Input_Attack_Instant.java index eed881f2066..06f67b181f9 100644 --- a/src/Input_Attack_Instant.java +++ b/src/forge/Input_Attack_Instant.java @@ -1,3 +1,4 @@ +package forge; public class Input_Attack_Instant extends Input { private static final long serialVersionUID = -8244057741266587006L; diff --git a/src/Input_Attack_Planeswalker.java b/src/forge/Input_Attack_Planeswalker.java similarity index 98% rename from src/Input_Attack_Planeswalker.java rename to src/forge/Input_Attack_Planeswalker.java index b55f36c4cf3..158d79b23db 100644 --- a/src/Input_Attack_Planeswalker.java +++ b/src/forge/Input_Attack_Planeswalker.java @@ -1,3 +1,4 @@ +package forge; public class Input_Attack_Planeswalker extends Input { private static final long serialVersionUID = 5738375759147611797L; diff --git a/src/Input_Before_Attack_Instant.java b/src/forge/Input_Before_Attack_Instant.java similarity index 94% rename from src/Input_Before_Attack_Instant.java rename to src/forge/Input_Before_Attack_Instant.java index 09164e68f43..328532c04c3 100644 --- a/src/Input_Before_Attack_Instant.java +++ b/src/forge/Input_Before_Attack_Instant.java @@ -1,3 +1,4 @@ +package forge; public class Input_Before_Attack_Instant extends Input { diff --git a/src/Input_Block.java b/src/forge/Input_Block.java similarity index 99% rename from src/Input_Block.java rename to src/forge/Input_Block.java index 0b10e24d4df..001c699272c 100644 --- a/src/Input_Block.java +++ b/src/forge/Input_Block.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class Input_Block extends Input diff --git a/src/Input_Block_Instant.java b/src/forge/Input_Block_Instant.java similarity index 98% rename from src/Input_Block_Instant.java rename to src/forge/Input_Block_Instant.java index 470cf67e915..5c7318780c1 100644 --- a/src/Input_Block_Instant.java +++ b/src/forge/Input_Block_Instant.java @@ -1,3 +1,4 @@ +package forge; public class Input_Block_Instant extends Input { private static final long serialVersionUID = 6024555691502280746L; diff --git a/src/Input_Block_Planeswalker.java b/src/forge/Input_Block_Planeswalker.java similarity index 99% rename from src/Input_Block_Planeswalker.java rename to src/forge/Input_Block_Planeswalker.java index 22f5ad30aee..9c875224493 100644 --- a/src/Input_Block_Planeswalker.java +++ b/src/forge/Input_Block_Planeswalker.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class Input_Block_Planeswalker extends Input diff --git a/src/Input_Cleanup.java b/src/forge/Input_Cleanup.java similarity index 98% rename from src/Input_Cleanup.java rename to src/forge/Input_Cleanup.java index f2c12465e49..8b23387d3fb 100644 --- a/src/Input_Cleanup.java +++ b/src/forge/Input_Cleanup.java @@ -1,3 +1,4 @@ +package forge; public class Input_Cleanup extends Input { private static final long serialVersionUID = -4164275418971547948L; diff --git a/src/Input_CombatDamage.java b/src/forge/Input_CombatDamage.java similarity index 99% rename from src/Input_CombatDamage.java rename to src/forge/Input_CombatDamage.java index 35b90c56f90..edb5cb13ac6 100644 --- a/src/Input_CombatDamage.java +++ b/src/forge/Input_CombatDamage.java @@ -1,3 +1,4 @@ +package forge; import java.util.ArrayList; public class Input_CombatDamage extends Input diff --git a/src/Input_Draw.java b/src/forge/Input_Draw.java similarity index 99% rename from src/Input_Draw.java rename to src/forge/Input_Draw.java index b2a2c7f5586..76f76c33c6f 100644 --- a/src/Input_Draw.java +++ b/src/forge/Input_Draw.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class Input_Draw extends Input diff --git a/src/Input_EOT.java b/src/forge/Input_EOT.java similarity index 98% rename from src/Input_EOT.java rename to src/forge/Input_EOT.java index 75892c28f55..f5eea896caa 100644 --- a/src/Input_EOT.java +++ b/src/forge/Input_EOT.java @@ -1,3 +1,4 @@ +package forge; public class Input_EOT extends Input { private static final long serialVersionUID = 5765929456837761648L; diff --git a/src/Input_FirstStrikeDamage.java b/src/forge/Input_FirstStrikeDamage.java similarity index 97% rename from src/Input_FirstStrikeDamage.java rename to src/forge/Input_FirstStrikeDamage.java index 0db1553aafe..c0799142e04 100644 --- a/src/Input_FirstStrikeDamage.java +++ b/src/forge/Input_FirstStrikeDamage.java @@ -1,3 +1,4 @@ +package forge; import java.util.ArrayList; //import java.util.ArrayList; //unused diff --git a/src/Input_Main.java b/src/forge/Input_Main.java similarity index 99% rename from src/Input_Main.java rename to src/forge/Input_Main.java index 8b1dd691616..17dff605a47 100644 --- a/src/Input_Main.java +++ b/src/forge/Input_Main.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; @SuppressWarnings("unused") // java.util.* diff --git a/src/Input_Mulligan.java b/src/forge/Input_Mulligan.java similarity index 98% rename from src/Input_Mulligan.java rename to src/forge/Input_Mulligan.java index 31900dbc0f3..21ab8208333 100644 --- a/src/Input_Mulligan.java +++ b/src/forge/Input_Mulligan.java @@ -1,3 +1,4 @@ +package forge; //import javax.swing.*; //unused diff --git a/src/Input_NoCost_TapAbility.java b/src/forge/Input_NoCost_TapAbility.java similarity index 97% rename from src/Input_NoCost_TapAbility.java rename to src/forge/Input_NoCost_TapAbility.java index 427cb3a64fc..e82a142a31c 100644 --- a/src/Input_NoCost_TapAbility.java +++ b/src/forge/Input_NoCost_TapAbility.java @@ -1,3 +1,4 @@ +package forge; public class Input_NoCost_TapAbility extends Input { private static final long serialVersionUID = 5382228961284472286L; diff --git a/src/Input_PayManaCost.java b/src/forge/Input_PayManaCost.java similarity index 99% rename from src/Input_PayManaCost.java rename to src/forge/Input_PayManaCost.java index 2d40b6cbe70..1dc614a8083 100644 --- a/src/Input_PayManaCost.java +++ b/src/forge/Input_PayManaCost.java @@ -1,3 +1,4 @@ +package forge; //import java.util.*; //pays the cost of a card played from the player's hand diff --git a/src/Input_PayManaCostUtil.java b/src/forge/Input_PayManaCostUtil.java similarity index 99% rename from src/Input_PayManaCostUtil.java rename to src/forge/Input_PayManaCostUtil.java index 913235163b0..66ab0385e13 100644 --- a/src/Input_PayManaCostUtil.java +++ b/src/forge/Input_PayManaCostUtil.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class Input_PayManaCostUtil diff --git a/src/Input_PayManaCost_Ability.java b/src/forge/Input_PayManaCost_Ability.java similarity index 99% rename from src/Input_PayManaCost_Ability.java rename to src/forge/Input_PayManaCost_Ability.java index 9c31f63c907..adb327a9c99 100644 --- a/src/Input_PayManaCost_Ability.java +++ b/src/forge/Input_PayManaCost_Ability.java @@ -1,3 +1,4 @@ +package forge; //import java.util.*; //if cost is paid, Command.execute() is called diff --git a/src/Input_StackNotEmpty.java b/src/forge/Input_StackNotEmpty.java similarity index 99% rename from src/Input_StackNotEmpty.java rename to src/forge/Input_StackNotEmpty.java index b9e4a5d4b5e..3a466475c9f 100644 --- a/src/Input_StackNotEmpty.java +++ b/src/forge/Input_StackNotEmpty.java @@ -1,3 +1,4 @@ +package forge; public class Input_StackNotEmpty extends Input implements java.io.Serializable { private static final long serialVersionUID = -3015125043127874730L; diff --git a/src/Input_Untap.java b/src/forge/Input_Untap.java similarity index 99% rename from src/Input_Untap.java rename to src/forge/Input_Untap.java index 44e3c8dba91..a3999d65501 100644 --- a/src/Input_Untap.java +++ b/src/forge/Input_Untap.java @@ -1,3 +1,4 @@ +package forge; public class Input_Untap extends Input { private static final long serialVersionUID = 3452595801560263386L; diff --git a/src/KeyListenerTest.java b/src/forge/KeyListenerTest.java similarity index 91% rename from src/KeyListenerTest.java rename to src/forge/KeyListenerTest.java index e7eb3ad66ab..aa7d9e7ea7b 100644 --- a/src/KeyListenerTest.java +++ b/src/forge/KeyListenerTest.java @@ -1,3 +1,4 @@ +package forge; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; diff --git a/src/MagicStack.java b/src/forge/MagicStack.java similarity index 98% rename from src/MagicStack.java rename to src/forge/MagicStack.java index 01a6c8f6f56..4997380bdf5 100644 --- a/src/MagicStack.java +++ b/src/forge/MagicStack.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class MagicStack extends MyObservable diff --git a/src/ManaCost.java b/src/forge/ManaCost.java similarity index 99% rename from src/ManaCost.java rename to src/forge/ManaCost.java index 409e435fe8f..8e61e625364 100644 --- a/src/ManaCost.java +++ b/src/forge/ManaCost.java @@ -1,3 +1,4 @@ +package forge; //import java.util.*; //unused diff --git a/src/ManaPool.java b/src/forge/ManaPool.java similarity index 99% rename from src/ManaPool.java rename to src/forge/ManaPool.java index ccf93b8a428..fa4829b214c 100644 --- a/src/ManaPool.java +++ b/src/forge/ManaPool.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; //import java.util.Arrays; diff --git a/src/Mana_Part.java b/src/forge/Mana_Part.java similarity index 97% rename from src/Mana_Part.java rename to src/forge/Mana_Part.java index 9ef02e04da9..4d5681bf6e3 100644 --- a/src/Mana_Part.java +++ b/src/forge/Mana_Part.java @@ -1,3 +1,4 @@ +package forge; public abstract class Mana_Part { abstract public String toString(); diff --git a/src/Mana_PartColor.java b/src/forge/Mana_PartColor.java similarity index 98% rename from src/Mana_PartColor.java rename to src/forge/Mana_PartColor.java index b2c93fd46ba..d29a7c3fa0c 100644 --- a/src/Mana_PartColor.java +++ b/src/forge/Mana_PartColor.java @@ -1,3 +1,4 @@ +package forge; public class Mana_PartColor extends Mana_Part { private String manaCost; diff --git a/src/Mana_PartColorless.java b/src/forge/Mana_PartColorless.java similarity index 98% rename from src/Mana_PartColorless.java rename to src/forge/Mana_PartColorless.java index 8859fe1d386..087870ae993 100644 --- a/src/Mana_PartColorless.java +++ b/src/forge/Mana_PartColorless.java @@ -1,3 +1,4 @@ +package forge; import forge.error.ErrorViewer; diff --git a/src/Mana_PartSplit.java b/src/forge/Mana_PartSplit.java similarity index 99% rename from src/Mana_PartSplit.java rename to src/forge/Mana_PartSplit.java index fd3b4cdd66f..eb2ec2f582b 100644 --- a/src/Mana_PartSplit.java +++ b/src/forge/Mana_PartSplit.java @@ -1,3 +1,4 @@ +package forge; //handles mana costs like 2/R or 2/B //for cards like Flame Javelin (Shadowmoor) public class Mana_PartSplit extends Mana_Part diff --git a/src/Mana_PartTest.java b/src/forge/Mana_PartTest.java similarity index 99% rename from src/Mana_PartTest.java rename to src/forge/Mana_PartTest.java index da900998d86..aa64fe43398 100644 --- a/src/Mana_PartTest.java +++ b/src/forge/Mana_PartTest.java @@ -1,3 +1,4 @@ +package forge; public class Mana_PartTest { static void testPayManaCost() diff --git a/src/Mana_PayCost.java b/src/forge/Mana_PayCost.java similarity index 99% rename from src/Mana_PayCost.java rename to src/forge/Mana_PayCost.java index 142e08311ef..9384aaf30f4 100644 --- a/src/Mana_PayCost.java +++ b/src/forge/Mana_PayCost.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class Mana_PayCost diff --git a/src/MenuItem_HowToPlay.java b/src/forge/MenuItem_HowToPlay.java similarity index 97% rename from src/MenuItem_HowToPlay.java rename to src/forge/MenuItem_HowToPlay.java index 8c0a7e478b8..d454485d3f8 100644 --- a/src/MenuItem_HowToPlay.java +++ b/src/forge/MenuItem_HowToPlay.java @@ -1,3 +1,4 @@ +package forge; @@ -81,7 +82,7 @@ public class MenuItem_HowToPlay extends JMenuItem implements NewConstants.LANG.H s.append("2. Multicolored Cards are slightly different than hybrid mana cards, as they require two or more different colors of mana, which may or not be in a single mana symbol. An example would be a card like Lightning Helix which requires one red and one white mana to be played.\r\n\r\n\r\n"); s.append("Game Types" + newLine); - s.append("1. In Constructed Deck mode you can use any of the cards to make your deck. To make a constructed deck, from the Deck Editor select \"New Deck – Constructed\". A list of all the cards will be displayed." + s.append("1. In Constructed Deck mode you can use any of the cards to make your deck. To make a constructed deck, from the Deck Editor select \"New Deck � Constructed\". A list of all the cards will be displayed." + newLine); s.append("2. In Sealed Deck mode you are given 75 cards and you have to make your deck from just those cards." + newLine); @@ -105,7 +106,7 @@ public class MenuItem_HowToPlay extends JMenuItem implements NewConstants.LANG.H + newLine); s.append("2. The \"Random\" option will randomly select one of the constructed decks that appear in the two deck menus. You either construct these decks in the Deck Editor or you imported a .deck file from the Deck Editor." + newLine); - s.append("If you select the \"Random\" option and click on the \"Start Game\" button and the match fails to begin … well, this happens if you fail to have any constructed decks saved to your all-decks2 file. You should choose the \"Generate Deck\" option instead.\r\n\r\n\r\n"); + s.append("If you select the \"Random\" option and click on the \"Start Game\" button and the match fails to begin � well, this happens if you fail to have any constructed decks saved to your all-decks2 file. You should choose the \"Generate Deck\" option instead.\r\n\r\n\r\n"); s.append("Resizable Game Area & Stack AI Land" + newLine); s.append("1. The \"Resizable Game Area\" check box should be set to on if your monitor will display more than 1024 x 768 pixels. The window containing the Battlefield and the informational displays will fill the entire screen." diff --git a/src/Move.java b/src/forge/Move.java similarity index 98% rename from src/Move.java rename to src/forge/Move.java index ad017d4ec7f..4aaf20a7618 100644 --- a/src/Move.java +++ b/src/forge/Move.java @@ -1,3 +1,4 @@ +package forge; public abstract class Move { abstract public Move[] generateMoves(); diff --git a/src/MoveAttack.java b/src/forge/MoveAttack.java similarity index 99% rename from src/MoveAttack.java rename to src/forge/MoveAttack.java index 739cd8ef09a..493e90b34e2 100644 --- a/src/MoveAttack.java +++ b/src/forge/MoveAttack.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class MoveAttack diff --git a/src/MyButton.java b/src/forge/MyButton.java similarity index 95% rename from src/MyButton.java rename to src/forge/MyButton.java index 6c4ca53cf64..edacd71ae49 100644 --- a/src/MyButton.java +++ b/src/forge/MyButton.java @@ -1,3 +1,4 @@ +package forge; public interface MyButton { // public MyButton(String buttonText, Command command) diff --git a/src/MyObservable.java b/src/forge/MyObservable.java similarity index 96% rename from src/MyObservable.java rename to src/forge/MyObservable.java index 05188dfa8da..8af82cd659f 100644 --- a/src/MyObservable.java +++ b/src/forge/MyObservable.java @@ -1,3 +1,4 @@ +package forge; import java.util.Observable; public class MyObservable extends Observable diff --git a/src/MyRandom.java b/src/forge/MyRandom.java similarity index 97% rename from src/MyRandom.java rename to src/forge/MyRandom.java index e43d743c236..d2e8373a4e8 100644 --- a/src/MyRandom.java +++ b/src/forge/MyRandom.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class MyRandom diff --git a/src/NameChanger.java b/src/forge/NameChanger.java similarity index 99% rename from src/NameChanger.java rename to src/forge/NameChanger.java index 8b4ddd2fc01..514e64155dc 100644 --- a/src/NameChanger.java +++ b/src/forge/NameChanger.java @@ -1,3 +1,4 @@ +package forge; import java.io.BufferedReader; import java.io.FileReader; import java.util.HashMap; diff --git a/src/NewIO.java b/src/forge/NewIO.java similarity index 99% rename from src/NewIO.java rename to src/forge/NewIO.java index f52dc1c99e2..8578da8c9b3 100644 --- a/src/NewIO.java +++ b/src/forge/NewIO.java @@ -1,3 +1,4 @@ +package forge; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; diff --git a/src/NonScrollingJEditorPane.java b/src/forge/NonScrollingJEditorPane.java similarity index 93% rename from src/NonScrollingJEditorPane.java rename to src/forge/NonScrollingJEditorPane.java index e73b6f254ea..decf8457c91 100644 --- a/src/NonScrollingJEditorPane.java +++ b/src/forge/NonScrollingJEditorPane.java @@ -1,3 +1,4 @@ +package forge; import java.awt.Dimension; import javax.swing.JEditorPane; diff --git a/src/Phase.java b/src/forge/Phase.java similarity index 99% rename from src/Phase.java rename to src/forge/Phase.java index 595aeb78d08..a49f2c717bb 100644 --- a/src/Phase.java +++ b/src/forge/Phase.java @@ -1,3 +1,4 @@ +package forge; import java.util.Observer; public class Phase extends MyObservable diff --git a/src/PhaseObserver.java b/src/forge/PhaseObserver.java similarity index 99% rename from src/PhaseObserver.java rename to src/forge/PhaseObserver.java index 1ab99c5f43f..a402fff1aca 100644 --- a/src/PhaseObserver.java +++ b/src/forge/PhaseObserver.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class PhaseObserver implements Observer diff --git a/src/PicturePanel.java b/src/forge/PicturePanel.java similarity index 97% rename from src/PicturePanel.java rename to src/forge/PicturePanel.java index 30fe93d3939..9b335c34072 100644 --- a/src/PicturePanel.java +++ b/src/forge/PicturePanel.java @@ -1,3 +1,4 @@ +package forge; import java.io.File; import javax.swing.ImageIcon; diff --git a/src/PlayerLife.java b/src/forge/PlayerLife.java similarity index 97% rename from src/PlayerLife.java rename to src/forge/PlayerLife.java index 7bb581c08fd..cdcf88f09de 100644 --- a/src/PlayerLife.java +++ b/src/forge/PlayerLife.java @@ -1,3 +1,4 @@ +package forge; public class PlayerLife extends MyObservable implements java.io.Serializable { private static final long serialVersionUID = -1614695903669967202L; diff --git a/src/PlayerZone.java b/src/forge/PlayerZone.java similarity index 98% rename from src/PlayerZone.java rename to src/forge/PlayerZone.java index cdca3091b08..ab61c20a36d 100644 --- a/src/PlayerZone.java +++ b/src/forge/PlayerZone.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; //PlayerZone observers the cards that are added to its zone diff --git a/src/PlayerZoneUtil.java b/src/forge/PlayerZoneUtil.java similarity index 99% rename from src/PlayerZoneUtil.java rename to src/forge/PlayerZoneUtil.java index 1d27cd4a186..6788fc7f890 100644 --- a/src/PlayerZoneUtil.java +++ b/src/forge/PlayerZoneUtil.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class PlayerZoneUtil diff --git a/src/PlayerZone_ComesIntoPlay.java b/src/forge/PlayerZone_ComesIntoPlay.java similarity index 99% rename from src/PlayerZone_ComesIntoPlay.java rename to src/forge/PlayerZone_ComesIntoPlay.java index 0b486a4831e..782dffe6ac8 100644 --- a/src/PlayerZone_ComesIntoPlay.java +++ b/src/forge/PlayerZone_ComesIntoPlay.java @@ -1,3 +1,4 @@ +package forge; import java.util.ArrayList; public class PlayerZone_ComesIntoPlay extends DefaultPlayerZone diff --git a/src/PrintCardNames.java b/src/forge/PrintCardNames.java similarity index 98% rename from src/PrintCardNames.java rename to src/forge/PrintCardNames.java index c3a2cfd1468..6ab6a196b48 100644 --- a/src/PrintCardNames.java +++ b/src/forge/PrintCardNames.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; import java.io.*; diff --git a/src/PrintCardPictures.java b/src/forge/PrintCardPictures.java similarity index 98% rename from src/PrintCardPictures.java rename to src/forge/PrintCardPictures.java index 31cabd25795..74c58595943 100644 --- a/src/PrintCardPictures.java +++ b/src/forge/PrintCardPictures.java @@ -1,3 +1,4 @@ +package forge; import java.io.FileWriter; diff --git a/src/QuestData.java b/src/forge/QuestData.java similarity index 93% rename from src/QuestData.java rename to src/forge/QuestData.java index 7d9dc647707..6a79243afeb 100644 --- a/src/QuestData.java +++ b/src/forge/QuestData.java @@ -1,11 +1,12 @@ +package forge; + import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -18,17 +19,6 @@ import forge.properties.ForgeProps; import forge.properties.NewConstants; - -class QuestData_State implements Serializable { - private static final long serialVersionUID = 7007940230351051937L; - - int rankIndex, win, lost; - String difficulty; - - ArrayList cardPool; - HashMap myDecks, aiDecks; -} - //when you create QuestData and AFTER you copy the AI decks over //you have to call one of these two methods below //see Gui_QuestOptions for more details @@ -161,7 +151,7 @@ public class QuestData implements NewConstants { data.easyAIDecks = readFile(ForgeProps.getFile(QUEST.EASY), aiDeckNames); data.mediumAIDecks = readFile(ForgeProps.getFile(QUEST.MEDIUM), aiDeckNames); data.hardAIDecks = readFile(ForgeProps.getFile(QUEST.HARD), aiDeckNames); - + } public String[] getOpponents(ArrayList aiDeck) { @@ -183,18 +173,15 @@ public class QuestData implements NewConstants { } list = noBlankLines; - if(list.size() < 3) - ErrorViewer.showError( - new Exception(), - "QuestData : readFile() error, file %s is too short, it must contain at least 3 ai decks names", - file); + if(list.size() < 3) ErrorViewer.showError(new Exception(), + "QuestData : readFile() error, file %s is too short, it must contain at least 3 ai decks names", + file); for(int i = 0; i < list.size(); i++) - if(!aiDecks.contains(list.get(i).toString())) - ErrorViewer.showError(new Exception(), - "QuestData : readFile() error, file %s contains the invalid ai deck name: %s", file, - list.get(i)); + if(!aiDecks.contains(list.get(i).toString())) ErrorViewer.showError(new Exception(), + "QuestData : readFile() error, file %s contains the invalid ai deck name: %s", file, + list.get(i)); return list; @@ -293,9 +280,8 @@ public class QuestData implements NewConstants { private Deck getDeckFromMap(Map map, String deckName) { - if(!map.containsKey(deckName)) - ErrorViewer.showError(new Exception(), - "QuestData : getDeckFromMap(String deckName) error, deck name not found - %s", deckName); + if(!map.containsKey(deckName)) ErrorViewer.showError(new Exception(), + "QuestData : getDeckFromMap(String deckName) error, deck name not found - %s", deckName); return map.get(deckName); } diff --git a/src/QuestData_BoosterPack.java b/src/forge/QuestData_BoosterPack.java similarity index 99% rename from src/QuestData_BoosterPack.java rename to src/forge/QuestData_BoosterPack.java index 836d2856bc3..4d84290520b 100644 --- a/src/QuestData_BoosterPack.java +++ b/src/forge/QuestData_BoosterPack.java @@ -1,3 +1,4 @@ +package forge; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; diff --git a/src/forge/QuestData_State.java b/src/forge/QuestData_State.java new file mode 100644 index 00000000000..7e2843cab2b --- /dev/null +++ b/src/forge/QuestData_State.java @@ -0,0 +1,37 @@ +package forge; +/** + * QuestData_State.java + * + * Created on 26.10.2009 + */ + + + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashMap; + + +/** + * The class QuestData_State. + * + * @version V0.0 26.10.2009 + * @author Clemens Koza + */ +public class QuestData_State implements Serializable { + private static final long serialVersionUID = 7007940230351051937L; + + int rankIndex, win, lost; + String difficulty; + + ArrayList cardPool; + HashMap myDecks, aiDecks; + + public QuestData_State() {} + + /** + * This constructor is used by QestData_State in the default package to create a replacement object for the + * obsolete class. + */ + public QuestData_State(int rankIndex, int win, int lost, String difficulty, ArrayList cardPool, HashMap myDecks, HashMap aiDecks) {} +} diff --git a/src/ReadBoosterPack.java b/src/forge/ReadBoosterPack.java similarity index 99% rename from src/ReadBoosterPack.java rename to src/forge/ReadBoosterPack.java index 4d196887c03..76b32182dc3 100644 --- a/src/ReadBoosterPack.java +++ b/src/forge/ReadBoosterPack.java @@ -1,3 +1,4 @@ +package forge; import java.io.BufferedReader; diff --git a/src/ReadCard.java b/src/forge/ReadCard.java similarity index 99% rename from src/ReadCard.java rename to src/forge/ReadCard.java index c288441381e..89cc2dd79da 100644 --- a/src/ReadCard.java +++ b/src/forge/ReadCard.java @@ -1,3 +1,4 @@ +package forge; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; diff --git a/src/Run.java b/src/forge/Run.java similarity index 99% rename from src/Run.java rename to src/forge/Run.java index 4eae973fff6..3f502bdb363 100644 --- a/src/Run.java +++ b/src/forge/Run.java @@ -1,3 +1,4 @@ +package forge; public class Run { public static void main(String[] args) { AllZone.Computer = new ComputerAI_Input(new ComputerAI_General()); diff --git a/src/RunTest.java b/src/forge/RunTest.java similarity index 99% rename from src/RunTest.java rename to src/forge/RunTest.java index 8f267786a95..92a7122bb2e 100644 --- a/src/RunTest.java +++ b/src/forge/RunTest.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class RunTest diff --git a/src/SimpleCombat.java b/src/forge/SimpleCombat.java similarity index 99% rename from src/SimpleCombat.java rename to src/forge/SimpleCombat.java index 392eaecad77..4c7e3a7932c 100644 --- a/src/SimpleCombat.java +++ b/src/forge/SimpleCombat.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; class SimpleCombat diff --git a/src/Spell.java b/src/forge/Spell.java similarity index 99% rename from src/Spell.java rename to src/forge/Spell.java index 6274b5cb0ee..d2613617a20 100644 --- a/src/Spell.java +++ b/src/forge/Spell.java @@ -1,3 +1,4 @@ +package forge; import forge.error.ErrorViewer; diff --git a/src/SpellAbility.java b/src/forge/SpellAbility.java similarity index 96% rename from src/SpellAbility.java rename to src/forge/SpellAbility.java index dda7c16e1e3..831fde9169a 100644 --- a/src/SpellAbility.java +++ b/src/forge/SpellAbility.java @@ -1,3 +1,4 @@ +package forge; //only SpellAbility can go on the stack //override any methods as needed public abstract class SpellAbility diff --git a/src/SpellAbilityList.java b/src/forge/SpellAbilityList.java similarity index 98% rename from src/SpellAbilityList.java rename to src/forge/SpellAbilityList.java index bb3a3474b85..8f8210f410b 100644 --- a/src/SpellAbilityList.java +++ b/src/forge/SpellAbilityList.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class SpellAbilityList diff --git a/src/SpellAbilityUtil.java b/src/forge/SpellAbilityUtil.java similarity index 99% rename from src/SpellAbilityUtil.java rename to src/forge/SpellAbilityUtil.java index 95c4fc23b46..c8f074509d7 100644 --- a/src/SpellAbilityUtil.java +++ b/src/forge/SpellAbilityUtil.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; public class SpellAbilityUtil diff --git a/src/Spell_Evoke.java b/src/forge/Spell_Evoke.java similarity index 98% rename from src/Spell_Evoke.java rename to src/forge/Spell_Evoke.java index ae1081660e5..98bfb6836a8 100644 --- a/src/Spell_Evoke.java +++ b/src/forge/Spell_Evoke.java @@ -1,3 +1,4 @@ +package forge; public class Spell_Evoke extends Spell_Permanent diff --git a/src/Spell_Permanent.java b/src/forge/Spell_Permanent.java similarity index 98% rename from src/Spell_Permanent.java rename to src/forge/Spell_Permanent.java index b0265d0b609..03de136b7eb 100644 --- a/src/Spell_Permanent.java +++ b/src/forge/Spell_Permanent.java @@ -1,3 +1,4 @@ +package forge; public class Spell_Permanent extends Spell { diff --git a/src/StackObserver.java b/src/forge/StackObserver.java similarity index 97% rename from src/StackObserver.java rename to src/forge/StackObserver.java index 8c0d3d9cd39..416722eceb1 100644 --- a/src/StackObserver.java +++ b/src/forge/StackObserver.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; //when something is put on the stack, this objects observers the Stack diff --git a/src/StateBasedEffects.java b/src/forge/StateBasedEffects.java similarity index 98% rename from src/StateBasedEffects.java rename to src/forge/StateBasedEffects.java index 875793226c0..368fe1fd819 100644 --- a/src/StateBasedEffects.java +++ b/src/forge/StateBasedEffects.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; diff --git a/src/TableModel.java b/src/forge/TableModel.java similarity index 96% rename from src/TableModel.java rename to src/forge/TableModel.java index b388ac9dd66..e524212ead0 100644 --- a/src/TableModel.java +++ b/src/forge/TableModel.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; import java.awt.event.*; diff --git a/src/TableSorter.java b/src/forge/TableSorter.java similarity index 99% rename from src/TableSorter.java rename to src/forge/TableSorter.java index 34d10da7645..9fa8b85a8d1 100644 --- a/src/TableSorter.java +++ b/src/forge/TableSorter.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; import forge.properties.ForgeProps; diff --git a/src/TempRun.java b/src/forge/TempRun.java similarity index 93% rename from src/TempRun.java rename to src/forge/TempRun.java index 77250a98228..27ad7ad0219 100644 --- a/src/TempRun.java +++ b/src/forge/TempRun.java @@ -1,3 +1,4 @@ +package forge; class TempRun { public static void main(String[] args) diff --git a/src/Test.java b/src/forge/Test.java similarity index 85% rename from src/Test.java rename to src/forge/Test.java index fb33ba00f6f..fed84a1538b 100644 --- a/src/Test.java +++ b/src/forge/Test.java @@ -1,3 +1,4 @@ +package forge; class Test { public static void main(String[] args) diff --git a/src/TestMove.java b/src/forge/TestMove.java similarity index 99% rename from src/TestMove.java rename to src/forge/TestMove.java index 8a176b9a374..97657fbcddd 100644 --- a/src/TestMove.java +++ b/src/forge/TestMove.java @@ -1,3 +1,4 @@ +package forge; import java.util.*; class TestMove extends Move diff --git a/src/TestPanel.java b/src/forge/TestPanel.java similarity index 98% rename from src/TestPanel.java rename to src/forge/TestPanel.java index 0b3038addc0..dfbd9762685 100644 --- a/src/TestPanel.java +++ b/src/forge/TestPanel.java @@ -1,3 +1,4 @@ +package forge; import java.awt.Color; import java.awt.Rectangle; diff --git a/src/Time.java b/src/forge/Time.java similarity index 95% rename from src/Time.java rename to src/forge/Time.java index 65fdf6a76df..48b25fd62dd 100644 --- a/src/Time.java +++ b/src/forge/Time.java @@ -1,3 +1,4 @@ +package forge; public class Time { private long startTime; diff --git a/src/UndoCommand.java b/src/forge/UndoCommand.java similarity index 86% rename from src/UndoCommand.java rename to src/forge/UndoCommand.java index 113246fd3b1..f62ea23f408 100644 --- a/src/UndoCommand.java +++ b/src/forge/UndoCommand.java @@ -1,3 +1,4 @@ +package forge; interface UndoCommand extends Command { public void execute(); diff --git a/src/Wait.java b/src/forge/Wait.java similarity index 95% rename from src/Wait.java rename to src/forge/Wait.java index 1dc0023b574..de13fb79aab 100644 --- a/src/Wait.java +++ b/src/forge/Wait.java @@ -1,3 +1,4 @@ +package forge; import forge.error.ErrorViewer; diff --git a/src/WinLose.java b/src/forge/WinLose.java similarity index 96% rename from src/WinLose.java rename to src/forge/WinLose.java index 43a01ecf869..2d700ff0e0f 100644 --- a/src/WinLose.java +++ b/src/forge/WinLose.java @@ -1,3 +1,4 @@ +package forge; public class WinLose { private int win;