From 5019f4455b21c5bd7e4f05030e2feb66b4abc76d Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Fri, 26 Apr 2013 03:57:08 +0000
Subject: [PATCH] FatPack generation rem warnings

---
 src/main/java/forge/card/BoosterTemplate.java |  6 +-----
 src/main/java/forge/card/FatPackTemplate.java | 13 ++++++++-----
 src/main/java/forge/gui/FNetOverlay.java      |  4 ++--
 src/main/java/forge/item/FatPack.java         |  2 +-
 src/main/java/forge/item/PrintSheet.java      |  1 -
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/main/java/forge/card/BoosterTemplate.java b/src/main/java/forge/card/BoosterTemplate.java
index 9c02bb97606..281c4c761c2 100644
--- a/src/main/java/forge/card/BoosterTemplate.java
+++ b/src/main/java/forge/card/BoosterTemplate.java
@@ -58,11 +58,7 @@ public class BoosterTemplate extends SealedProductTemplate {
         if (0 < lastCommaIdx) {
             s.replace(lastCommaIdx+1, lastCommaIdx+1, " and");
         }
-        
-        if (0 < foilRate) {
-            s.append(", with a foil rate of 1 in ").append(foilRate);
-        }
-        
+
         return s.toString();
     }
 
diff --git a/src/main/java/forge/card/FatPackTemplate.java b/src/main/java/forge/card/FatPackTemplate.java
index ba6723da6bd..dcefcd28d08 100644
--- a/src/main/java/forge/card/FatPackTemplate.java
+++ b/src/main/java/forge/card/FatPackTemplate.java
@@ -69,16 +69,19 @@ public class FatPackTemplate extends SealedProductTemplate {
         }
 
         StringBuilder s = new StringBuilder();
-        if (0 < cntBoosters) {
-            s.append(cntBoosters).append(" booster packs, ");
-        }
-
         for(Pair<String, Integer> p : slots) {
             s.append(p.getRight()).append(" ").append(p.getLeft()).append(", ");
         }
         // trim the last comma and space
-        s.replace(s.length() - 2, s.length(), "");
+        if( s.length() > 0 )
+            s.replace(s.length() - 2, s.length(), "");
 
+        if (0 < cntBoosters) {
+            if( s.length() > 0 )
+                s.append(" and ");
+                
+            s.append(cntBoosters).append(" booster packs ");
+        }
         return s.toString();
     }
 }
diff --git a/src/main/java/forge/gui/FNetOverlay.java b/src/main/java/forge/gui/FNetOverlay.java
index 292a9ea9d1c..7933cd83ed3 100644
--- a/src/main/java/forge/gui/FNetOverlay.java
+++ b/src/main/java/forge/gui/FNetOverlay.java
@@ -44,7 +44,7 @@ public enum FNetOverlay {
     private final FLabel cmdSend = new FLabel.ButtonBuilder().text("Send").build(); 
 
     
-    private boolean minimized = false;
+    //private boolean minimized = false;
     private int height = 120;
     private int width = 400;
 
@@ -62,7 +62,7 @@ public enum FNetOverlay {
         }
     };
     
-    private final int minimizedHeight = 30;
+    //private final int minimizedHeight = 30;
     
     /**
      * Semi-transparent overlay panel. Should be used with layered panes.
diff --git a/src/main/java/forge/item/FatPack.java b/src/main/java/forge/item/FatPack.java
index ff61c13c3ed..cb879e0953d 100644
--- a/src/main/java/forge/item/FatPack.java
+++ b/src/main/java/forge/item/FatPack.java
@@ -60,7 +60,7 @@ public class FatPack extends OpenablePack {
         for (int i = 0; i < fpData.getCntBoosters(); i++) {
             result.addAll(super.generate());
         }
-        result.addAll(BoosterGenerator.getBoosterPack(contents));
+        result.addAll(BoosterGenerator.getBoosterPack(fpData));
         return result;
     }
 
diff --git a/src/main/java/forge/item/PrintSheet.java b/src/main/java/forge/item/PrintSheet.java
index 116e655ca45..d62909c3354 100644
--- a/src/main/java/forge/item/PrintSheet.java
+++ b/src/main/java/forge/item/PrintSheet.java
@@ -1,6 +1,5 @@
 package forge.item;
 
-import java.io.File;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.ArrayList;