Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

relocate IRenderableCard into magic.model.

master
lodici 2016-10-06 12:26:58 +01:00
parent be58fc13c1
commit 79ae406b44
14 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/magic/cardBuilder/renderers/CardBuilder.java
View File

@ -7,7 +7,7 @@ import java.awt.image.BufferedImage;
import magic.model.MagicAbility;
import magic.model.MagicSubType;
import magic.model.MagicType;
import magic.cardBuilder.IRenderableCard;
import magic.model.IRenderableCard;
public class CardBuilder {

2
src/magic/cardBuilder/renderers/Frame.java
View File

@ -16,7 +16,7 @@ import magic.model.MagicManaType;
import magic.model.MagicSubType;
import magic.model.MagicType;
import magic.model.event.MagicManaActivation;
import magic.cardBuilder.IRenderableCard;
import magic.model.IRenderableCard;
import magic.cardBuilder.ResourceManager;
public class Frame {

2
src/magic/cardBuilder/renderers/ImageFrame.java
View File

@ -11,7 +11,7 @@ import magic.model.MagicColor;
import magic.model.MagicType;
import magic.ui.ImageFileIO;
import magic.ui.MagicImages;
import magic.cardBuilder.IRenderableCard;
import magic.model.IRenderableCard;
import magic.cardBuilder.ResourceManager;
import magic.ui.utility.GraphicsUtils;
import magic.utility.MagicFileSystem;

2
src/magic/cardBuilder/renderers/OracleText.java
View File

@ -26,7 +26,7 @@ import java.util.TreeMap;
import magic.model.MagicColor;
import magic.model.MagicType;
import magic.ui.MagicImages;
import magic.cardBuilder.IRenderableCard;
import magic.model.IRenderableCard;
import magic.cardBuilder.ResourceManager;
import magic.ui.utility.GraphicsUtils;

2
src/magic/cardBuilder/renderers/Overlay.java
View File

@ -8,7 +8,7 @@ import java.util.stream.Collectors;
import magic.model.MagicAbility;
import magic.model.MagicColor;
import magic.cardBuilder.IRenderableCard;
import magic.model.IRenderableCard;
import magic.cardBuilder.ResourceManager;
public class Overlay {

2
src/magic/cardBuilder/renderers/PTFrame.java
View File

@ -16,7 +16,7 @@ import magic.model.MagicAbility;
import magic.model.MagicColor;
import magic.model.MagicSubType;
import magic.model.MagicType;
import magic.cardBuilder.IRenderableCard;
import magic.model.IRenderableCard;
import magic.cardBuilder.ResourceManager;
public class PTFrame {

2
src/magic/cardBuilder/renderers/TitleFrame.java
View File

@ -19,7 +19,7 @@ import javax.swing.ImageIcon;
import magic.data.MagicIcon;
import magic.model.MagicType;
import magic.ui.MagicImages;
import magic.cardBuilder.IRenderableCard;
import magic.model.IRenderableCard;
import magic.cardBuilder.ResourceManager;
public class TitleFrame {

2
src/magic/cardBuilder/renderers/TypeLine.java
View File

@ -9,7 +9,7 @@ import java.awt.RenderingHints;
import java.awt.image.BufferedImage;
import magic.model.MagicType;
import magic.cardBuilder.IRenderableCard;
import magic.model.IRenderableCard;
import magic.cardBuilder.ResourceManager;
public class TypeLine {

13
src/magic/cardBuilder/IRenderableCard.java → src/magic/model/IRenderableCard.java
View File

@ -1,19 +1,10 @@
package magic.cardBuilder;
package magic.model;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.HashSet;
import magic.model.MagicAbility;
import magic.model.MagicCardDefinition;
import magic.model.MagicColor;
import magic.model.MagicManaCost;
import magic.model.MagicPermanent;
import magic.model.MagicSubType;
import magic.model.MagicType;
import magic.model.MagicCostManaType;
import magic.model.event.MagicManaActivation;
public interface IRenderableCard {

1
src/magic/model/MagicCard.java
View File

@ -17,7 +17,6 @@ import magic.model.stack.MagicItemOnStack;
import magic.model.target.MagicTarget;
import magic.model.target.MagicTargetFilter;
import magic.model.target.MagicTargetType;
import magic.cardBuilder.IRenderableCard;
public class MagicCard
extends MagicObjectImpl

1
src/magic/model/MagicCardDefinition.java
View File

@ -15,7 +15,6 @@ import magic.model.trigger.ThisCycleTrigger;
import magic.model.trigger.ThisDrawnTrigger;
import magic.model.trigger.ThisPutIntoGraveyardTrigger;
import magic.model.trigger.ThisSpellIsCastTrigger;
import magic.cardBuilder.IRenderableCard;
import magic.utility.MagicFileSystem;
public class MagicCardDefinition implements MagicAbilityStore, IRenderableCard {

1
src/magic/model/MagicPermanent.java
View File

@ -34,7 +34,6 @@ import magic.model.target.MagicTargetFilterFactory;
import magic.model.trigger.EntersBattlefieldTrigger;
import magic.model.trigger.MagicTrigger;
import magic.model.trigger.MagicTriggerType;
import magic.cardBuilder.IRenderableCard;
public class MagicPermanent extends MagicObjectImpl implements MagicSource, MagicTarget, Comparable<MagicPermanent>, MagicMappable<MagicPermanent>, IRenderableCard {

2
src/magic/ui/MagicImages.java
View File

@ -12,7 +12,7 @@ import java.util.Map;
import javax.swing.ImageIcon;
import magic.cardBuilder.renderers.CardBuilder;
import magic.cardBuilder.IRenderableCard;
import magic.model.IRenderableCard;
import magic.data.CardImageFile;
import magic.data.GeneralConfig;
import magic.data.LRUCache;

2
src/magic/utility/MagicFileSystem.java
View File

@ -22,7 +22,7 @@ import java.util.List;
import magic.data.GeneralConfig;
import magic.model.MagicCardDefinition;
import magic.cardBuilder.IRenderableCard;
import magic.model.IRenderableCard;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;