From a02c0fac2fcd105ea5e839909bb821ae87eae29c Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Mon, 3 Aug 2015 14:45:08 +0200
Subject: [PATCH] * Fixed a bug that prevented that cards from Classic Six
 Edition were shown in mage.

---
 Mage.Sets/src/mage/sets/ClassicSixthEdition.java |  1 -
 Mage.Sets/src/mage/sets/FifthEdition.java        |  6 +++---
 Mage/src/mage/util/ClassScanner.java             | 12 ++++++------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/ClassicSixthEdition.java b/Mage.Sets/src/mage/sets/ClassicSixthEdition.java
index 543300a0f50..191829e2a60 100644
--- a/Mage.Sets/src/mage/sets/ClassicSixthEdition.java
+++ b/Mage.Sets/src/mage/sets/ClassicSixthEdition.java
@@ -28,7 +28,6 @@
 package mage.sets;
 
 import java.util.GregorianCalendar;
-
 import mage.cards.ExpansionSet;
 import mage.constants.SetType;
 
diff --git a/Mage.Sets/src/mage/sets/FifthEdition.java b/Mage.Sets/src/mage/sets/FifthEdition.java
index 5f3a0b10e3b..91d596d49a0 100644
--- a/Mage.Sets/src/mage/sets/FifthEdition.java
+++ b/Mage.Sets/src/mage/sets/FifthEdition.java
@@ -1,12 +1,12 @@
 package mage.sets;
 
 import java.util.GregorianCalendar;
-import mage.constants.SetType;
 import mage.cards.ExpansionSet;
+import mage.constants.SetType;
 
 public class FifthEdition extends ExpansionSet {
 
-    private static final FifthEdition fINSTANCE =  new FifthEdition();
+    private static final FifthEdition fINSTANCE = new FifthEdition();
 
     public static FifthEdition getInstance() {
         return fINSTANCE;
@@ -19,7 +19,7 @@ public class FifthEdition extends ExpansionSet {
         this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
-    this.ratioBoosterMythic = 0;
+        this.ratioBoosterMythic = 0;
     }
 
 }
diff --git a/Mage/src/mage/util/ClassScanner.java b/Mage/src/mage/util/ClassScanner.java
index 434258be2ed..88406c6250e 100644
--- a/Mage/src/mage/util/ClassScanner.java
+++ b/Mage/src/mage/util/ClassScanner.java
@@ -47,13 +47,13 @@ import java.util.jar.JarInputStream;
 public class ClassScanner {
 
     public static List<Class> findClasses(List<String> packages, Class<?> type) {
-        List<Class> cards = new ArrayList<Class>();
+        List<Class> cards = new ArrayList<>();
         try {
             ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
             assert classLoader != null;
 
-            HashMap<String, String> dirs = new HashMap<String, String>();
-            TreeSet<String> jars = new TreeSet<String>();
+            HashMap<String, String> dirs = new HashMap<>();
+            TreeSet<String> jars = new TreeSet<>();
             for (String packageName : packages) {
                 String path = packageName.replace('.', '/');
                 Enumeration<URL> resources = classLoader.getResources(path);
@@ -84,7 +84,7 @@ public class ClassScanner {
     }
 
     private static List<Class> findClasses(File directory, String packageName, Class<?> type) {
-        List<Class> cards = new ArrayList<Class>();
+        List<Class> cards = new ArrayList<>();
         if (!directory.exists()) {
             return cards;
         }
@@ -104,7 +104,7 @@ public class ClassScanner {
     }
 
     private static List<Class> findClassesInJar(File file, List<String> packages, Class<?> type) {
-        List<Class> cards = new ArrayList<Class>();
+        List<Class> cards = new ArrayList<>();
         if (!file.exists()) {
             return cards;
         }
@@ -117,7 +117,7 @@ public class ClassScanner {
                     break;
                 }
                 if (jarEntry.getName().endsWith(".class")) {
-                    String className = jarEntry.getName().replace('/', '.').replace(".class", "");
+                    String className = jarEntry.getName().replace(".class", "").replace('/', '.');
                     int packageNameEnd = className.lastIndexOf('.');
                     String packageName = packageNameEnd != -1 ? className.substring(0, packageNameEnd) : "";
                     if (packages.contains(packageName)) {