From 0a697d9c1c15565343f8c09eb160512a060e6b7e Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Wed, 20 Feb 2013 13:45:32 +0000
Subject: [PATCH] CardFace prettifying

---
 .gitattributes                                |  2 +-
 .../{CardFaceRules.java => CardFace.java}     | 26 +++++++++++--------
 src/main/java/forge/card/CardRulesReader.java |  4 +--
 3 files changed, 18 insertions(+), 14 deletions(-)
 rename src/main/java/forge/card/{CardFaceRules.java => CardFace.java} (76%)

diff --git a/.gitattributes b/.gitattributes
index 4e5c352344c..66b2aecaa94 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13638,7 +13638,7 @@ src/main/java/forge/card/CardBlock.java -text
 src/main/java/forge/card/CardCharacteristics.java -text
 src/main/java/forge/card/CardCoreType.java -text
 src/main/java/forge/card/CardEdition.java -text
-src/main/java/forge/card/CardFaceRules.java -text
+src/main/java/forge/card/CardFace.java -text
 src/main/java/forge/card/CardInSet.java -text
 src/main/java/forge/card/CardRarity.java -text
 src/main/java/forge/card/CardRules.java -text
diff --git a/src/main/java/forge/card/CardFaceRules.java b/src/main/java/forge/card/CardFace.java
similarity index 76%
rename from src/main/java/forge/card/CardFaceRules.java
rename to src/main/java/forge/card/CardFace.java
index 059670b5cf3..00c76c579a2 100644
--- a/src/main/java/forge/card/CardFaceRules.java
+++ b/src/main/java/forge/card/CardFace.java
@@ -16,10 +16,11 @@ import forge.card.mana.ManaCost;
 // 
 
 /** 
- * TODO: Write javadoc for this type.
- *
+ * Represents a single side or part of a magic card with its original characteristics. 
+ * <br><br>
+ * <i>Do not use reference to class except for card parsing.<br>Always use reference to interface type outside of package.</i>
  */
-final class CardFaceRules implements ICardCharacteristics {
+final class CardFace implements ICardCharacteristics {
 
     private final String name;
     private CardType type = null;
@@ -41,17 +42,20 @@ final class CardFaceRules implements ICardCharacteristics {
     @Override public final int getIntToughness()          { return iToughness; }
     @Override public final String getPower()              { return power; }
     @Override public final String getToughness()          { return toughness; }
-    @Override public int getInitialLoyalty()        { return initialLoyalty; }
-    @Override public final String getName()         { return this.name; }
-    @Override public final CardType getType()       { return this.type; }
-    @Override public final ManaCost getManaCost()   { return this.manaCost; }
-    @Override public final ColorSet getColor()      { return this.color; }
+    @Override public int getInitialLoyalty()              { return initialLoyalty; }
+    @Override public final String getName()               { return this.name; }
+    @Override public final CardType getType()             { return this.type; }
+    @Override public final ManaCost getManaCost()         { return this.manaCost; }
+    @Override public final ColorSet getColor()            { return this.color; }
     @Override public final Iterable<String> getKeywords() { return keywords; }
 
 
+    public CardFace(String name0) { 
+        this.name = name0; 
+        if ( StringUtils.isBlank(name0) )
+            throw new RuntimeException("Card name is empty");
+    }
     // Here come setters to allow parser supply values
-    public CardFaceRules(String name0) { this.name = name0; if ( StringUtils.isBlank(name0) ) throw new RuntimeException("Card name is empty"); }
-
     public final void setType(CardType type0)             { this.type = type0; }
     public final void setManaCost(ManaCost manaCost0)     { this.manaCost = manaCost0; }
     public final void setColor(ColorSet color0)           { this.color = color0; }
@@ -78,7 +82,7 @@ final class CardFaceRules implements ICardCharacteristics {
     }
 
 
-    // This should not be here
+    // This should not be here, but I don't know a better place yet 
     private final Map<String, CardInSet> setsPrinted = new TreeMap<String, CardInSet>(String.CASE_INSENSITIVE_ORDER);
     @Override public Set<Entry<String, CardInSet>> getSetsPrinted() { return this.setsPrinted.entrySet(); }
     @Override public CardInSet getEditionInfo(final String setCode) {
diff --git a/src/main/java/forge/card/CardRulesReader.java b/src/main/java/forge/card/CardRulesReader.java
index 8d331990f09..9f5bb45951f 100644
--- a/src/main/java/forge/card/CardRulesReader.java
+++ b/src/main/java/forge/card/CardRulesReader.java
@@ -41,7 +41,7 @@ public class CardRulesReader {
     // fields to build 
     private List<String> originalScript = new ArrayList<String>();
 
-    private CardFaceRules[] faces = new CardFaceRules[] { null, null };
+    private CardFace[] faces = new CardFace[] { null, null };
     private String[] pictureUrl = new String[] { null, null };
     private int curFace = 0;
     private CardSplitType altMode;
@@ -163,7 +163,7 @@ public class CardRulesReader {
 
             case 'N':
                 if ("Name".equals(key)) {
-                    this.faces[this.curFace] = new CardFaceRules(value);
+                    this.faces[this.curFace] = new CardFace(value);
                 }
                 break;