From 613d9aef783defbc4c022588966811d032fcf143 Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Mon, 5 Sep 2011 16:09:20 +0000
Subject: [PATCH] does not force deck to have comment or playerType

---
 src/main/java/forge/deck/Deck.java        | 6 +++---
 src/main/java/forge/deck/DeckManager.java | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/forge/deck/Deck.java b/src/main/java/forge/deck/Deck.java
index b0544652cba..c8d8ad0489a 100644
--- a/src/main/java/forge/deck/Deck.java
+++ b/src/main/java/forge/deck/Deck.java
@@ -26,8 +26,8 @@ public final class Deck implements Comparable<Deck>, Serializable {
 
     private String name;
     private String deckType;
-    private String comment;
-    private PlayerType playerType;
+    private String comment = null;
+    private PlayerType playerType = null;
     
     private CardPool main;
     private CardPool sideboard;
@@ -152,7 +152,7 @@ public final class Deck implements Comparable<Deck>, Serializable {
      * @return a {@link java.lang.String} object.
      */
     public String getComment() {
-        return comment == null ? "" : comment;
+        return comment;
     }
 
     /**
diff --git a/src/main/java/forge/deck/DeckManager.java b/src/main/java/forge/deck/DeckManager.java
index a10acf67056..9ccf7bdb9ed 100644
--- a/src/main/java/forge/deck/DeckManager.java
+++ b/src/main/java/forge/deck/DeckManager.java
@@ -463,14 +463,14 @@ public class DeckManager {
      * @param out a {@link java.io.BufferedWriter} object.
      * @throws java.io.IOException if any.
      */
-    private static void writeDeck(Deck d, BufferedWriter out) throws IOException {
+    private static void writeDeck(final Deck d, final BufferedWriter out) throws IOException {
         out.write("[metadata]\n");
 
-        
         out.write(format("%s=%s%n", NAME, d.getName().replaceAll("\n", "")));
         out.write(format("%s=%s%n", DECK_TYPE, d.getDeckType().replaceAll("\n", "")));
-        out.write(format("%s=%s%n", COMMENT, d.getComment().replaceAll("\n", "")));
-        out.write(format("%s=%s%n", PLAYER, d.getPlayerType()));
+        // these are optional
+        if (d.getComment() != null) { out.write(format("%s=%s%n", COMMENT, d.getComment().replaceAll("\n", ""))); }
+        if (d.getPlayerType() != null) { out.write(format("%s=%s%n", PLAYER, d.getPlayerType())); }
 
         out.write(format("%s%n", "[main]"));
         for (Entry<CardPrinted, Integer> e : d.getMain()) {