rename files

.gitattributes

@@ -10252,14 +10252,14 @@ src/main/java/forge/Card.java svneol=native#text/plain
 src/main/java/forge/CardColor.java svneol=native#text/plain
 src/main/java/forge/CardContainer.java svneol=native#text/plain
 src/main/java/forge/CardFilter.java svneol=native#text/plain
+src/main/java/forge/CardKeywords.java -text svneol=native#text/plain
 src/main/java/forge/CardList.java svneol=native#text/plain
 src/main/java/forge/CardListFilter.java svneol=native#text/plain
 src/main/java/forge/CardListUtil.java svneol=native#text/plain
 src/main/java/forge/CardPowerToughness.java svneol=native#text/plain
 src/main/java/forge/CardReader.java svneol=native#text/plain
+src/main/java/forge/CardType.java svneol=native#text/plain
 src/main/java/forge/CardUtil.java svneol=native#text/plain
-src/main/java/forge/Card_Keywords.java -text
-src/main/java/forge/Card_Type.java svneol=native#text/plain
 src/main/java/forge/Color.java svneol=native#text/plain
 src/main/java/forge/ColorChanger.java -text
 src/main/java/forge/Combat.java svneol=native#text/plain
@@ -10269,14 +10269,14 @@ src/main/java/forge/CommandArgs.java svneol=native#text/plain
 src/main/java/forge/CommandList.java svneol=native#text/plain
 src/main/java/forge/CommandReturn.java svneol=native#text/plain
 src/main/java/forge/Computer.java svneol=native#text/plain
-src/main/java/forge/ComputerAI_General.java svneol=native#text/plain
+src/main/java/forge/ComputerAIGeneral.java svneol=native#text/plain
-src/main/java/forge/ComputerAI_Input.java svneol=native#text/plain
+src/main/java/forge/ComputerAIInput.java svneol=native#text/plain
 src/main/java/forge/ComputerUtil.java svneol=native#text/plain
-src/main/java/forge/ComputerUtil_Attack2.java svneol=native#text/plain
+src/main/java/forge/ComputerUtilAttack2.java svneol=native#text/plain
-src/main/java/forge/ComputerUtil_Block2.java svneol=native#text/plain
+src/main/java/forge/ComputerUtilBlock2.java svneol=native#text/plain
 src/main/java/forge/Constant.java svneol=native#text/plain
-src/main/java/forge/Constant_StringArrayList.java svneol=native#text/plain
+src/main/java/forge/ConstantStringArrayList.java svneol=native#text/plain
-src/main/java/forge/Constant_StringHashMap.java svneol=native#text/plain
+src/main/java/forge/ConstantStringHashMap.java svneol=native#text/plain
 src/main/java/forge/CopyFiles.java svneol=native#text/plain
 src/main/java/forge/Counters.java svneol=native#text/plain
 src/main/java/forge/DefaultPlayerZone.java svneol=native#text/plain
@@ -10286,22 +10286,22 @@ src/main/java/forge/EndOfTurn.java svneol=native#text/plain
 src/main/java/forge/ExternalPanel.java svneol=native#text/plain
 src/main/java/forge/FileFinder.java svneol=native#text/plain
 src/main/java/forge/FileUtil.java svneol=native#text/plain
-src/main/java/forge/GUI_ImportPicture.java svneol=native#text/plain
 src/main/java/forge/GameAction.java svneol=native#text/plain
 src/main/java/forge/GameActionUtil.java svneol=native#text/plain
 src/main/java/forge/GameEntity.java -text
 src/main/java/forge/GuiDisplay4.java svneol=native#text/plain
 src/main/java/forge/GuiDisplayUtil.java svneol=native#text/plain
+src/main/java/forge/GuiDownloadPicturesLQ.java svneol=native#text/plain
+src/main/java/forge/GuiDownloadPrices.java svneol=native#text/plain
 src/main/java/forge/GuiDownloadQuestImages.java -text
+src/main/java/forge/GuiDownloadSetPicturesLQ.java svneol=native#text/plain
 src/main/java/forge/GuiDownloader.java -text
+src/main/java/forge/GuiImportPicture.java svneol=native#text/plain
 src/main/java/forge/GuiInput.java svneol=native#text/plain
-src/main/java/forge/Gui_DownloadPictures_LQ.java svneol=native#text/plain
+src/main/java/forge/GuiMigrateLocalMWSSetPicturesHQ.java svneol=native#text/plain
-src/main/java/forge/Gui_DownloadPrices.java svneol=native#text/plain
+src/main/java/forge/GuiMultipleBlockers4.java svneol=native#text/plain
-src/main/java/forge/Gui_DownloadSetPictures_LQ.java svneol=native#text/plain
+src/main/java/forge/GuiNewGame.java svneol=native#text/plain
-src/main/java/forge/Gui_MigrateLocalMWSSetPictures_HQ.java svneol=native#text/plain
+src/main/java/forge/GuiProgressBarWindow.java svneol=native#text/plain
-src/main/java/forge/Gui_MultipleBlockers4.java svneol=native#text/plain
-src/main/java/forge/Gui_NewGame.java svneol=native#text/plain
-src/main/java/forge/Gui_ProgressBarWindow.java svneol=native#text/plain
 src/main/java/forge/HandSizeOp.java svneol=native#text/plain
 src/main/java/forge/HttpUtil.java svneol=native#text/plain
 src/main/java/forge/HumanPlayer.java svneol=native#text/plain

src/main/java/forge/Card.java

@@ -201,8 +201,8 @@ public class Card extends GameEntity implements Comparable<Card> {
     private ArrayList<String> targetsForChoices = new ArrayList<String>();
 
     // changes by AF animate and continuous static effects
-    private ArrayList<Card_Type> changedCardTypes = new ArrayList<Card_Type>();
+    private ArrayList<CardType> changedCardTypes = new ArrayList<CardType>();
-    private ArrayList<Card_Keywords> changedCardKeywords = new ArrayList<Card_Keywords>();
+    private ArrayList<CardKeywords> changedCardKeywords = new ArrayList<CardKeywords>();
 
     private ArrayList<Object> rememberedObjects = new ArrayList<Object>();
     private ArrayList<Card> imprintedCards = new ArrayList<Card>();
@@ -4034,10 +4034,10 @@ public class Card extends GameEntity implements Comparable<Card> {
         if (!changedCardTypes.isEmpty()) {
 
             ArrayList<String> newType = new ArrayList<String>(getCharacteristics().getType());
-            ArrayList<Card_Type> types = changedCardTypes;
+            ArrayList<CardType> types = changedCardTypes;
             Collections.sort(types); // sorts types by timeStamp
 
-            for (Card_Type ct : types) {
+            for (CardType ct : types) {
                 ArrayList<String> removeTypes = new ArrayList<String>();
                 if (ct.getRemoveType() != null) {
                     removeTypes.addAll(ct.getRemoveType());
@@ -4080,7 +4080,7 @@ public class Card extends GameEntity implements Comparable<Card> {
      * @param types
      *            a ArrayList<Card_Type>
      */
-    public final void setChangedCardTypes(final ArrayList<Card_Type> types) {
+    public final void setChangedCardTypes(final ArrayList<CardType> types) {
         changedCardTypes = types;
     }
 
@@ -4090,7 +4090,7 @@ public class Card extends GameEntity implements Comparable<Card> {
      * 
      * @return ArrayList<Card_Type>
      */
-    public final ArrayList<Card_Type> getChangedCardTypes() {
+    public final ArrayList<CardType> getChangedCardTypes() {
         return changedCardTypes;
     }
 
@@ -4117,7 +4117,7 @@ public class Card extends GameEntity implements Comparable<Card> {
             final boolean removeSuperTypes, final boolean removeCardTypes, final boolean removeSubTypes,
             final boolean removeCreatureTypes, long timestamp) {
 
-        changedCardTypes.add(new Card_Type(types, removeTypes, removeSuperTypes, removeCardTypes, removeSubTypes,
+        changedCardTypes.add(new CardType(types, removeTypes, removeSuperTypes, removeCardTypes, removeSubTypes,
                 removeCreatureTypes, timestamp));
     }
 
@@ -4166,7 +4166,7 @@ public class Card extends GameEntity implements Comparable<Card> {
      */
     public final void removeChangedCardTypes(long timestamp) {
         for (int i = 0; i < changedCardTypes.size(); i++) {
-            Card_Type cardT = changedCardTypes.get(i);
+            CardType cardT = changedCardTypes.get(i);
             if (cardT.getTimestamp() == timestamp) {
                 changedCardTypes.remove(cardT);
             }
@@ -4949,7 +4949,7 @@ public class Card extends GameEntity implements Comparable<Card> {
      * @param kw
      *            the new changed card keywords
      */
-    public final void setChangedCardKeywords(final ArrayList<Card_Keywords> kw) {
+    public final void setChangedCardKeywords(final ArrayList<CardKeywords> kw) {
         changedCardKeywords = kw;
     }
 
@@ -4958,7 +4958,7 @@ public class Card extends GameEntity implements Comparable<Card> {
      * 
      * @return the changed card keywords
      */
-    public final ArrayList<Card_Keywords> getChangedCardKeywords() {
+    public final ArrayList<CardKeywords> getChangedCardKeywords() {
         return changedCardKeywords;
     }
 
@@ -4977,7 +4977,7 @@ public class Card extends GameEntity implements Comparable<Card> {
     public final void addChangedCardKeywords(final ArrayList<String> keywords, final ArrayList<String> removeKeywords,
             final boolean removeAllKeywords, long timestamp) {
 
-        changedCardKeywords.add(new Card_Keywords(keywords, removeKeywords, removeAllKeywords, timestamp));
+        changedCardKeywords.add(new CardKeywords(keywords, removeKeywords, removeAllKeywords, timestamp));
     }
 
     /**
@@ -5015,7 +5015,7 @@ public class Card extends GameEntity implements Comparable<Card> {
      */
     public final void removeChangedCardKeywords(long timestamp) {
         for (int i = 0; i < changedCardKeywords.size(); i++) {
-            Card_Keywords cardK = changedCardKeywords.get(i);
+            CardKeywords cardK = changedCardKeywords.get(i);
             if (cardK.getTimestamp() == timestamp) {
                 changedCardKeywords.remove(cardK);
             }
@@ -5038,10 +5038,10 @@ public class Card extends GameEntity implements Comparable<Card> {
         // see if keyword changes are in effect
         if (!changedCardKeywords.isEmpty()) {
 
-            ArrayList<Card_Keywords> newKeywords = changedCardKeywords;
+            ArrayList<CardKeywords> newKeywords = changedCardKeywords;
             Collections.sort(newKeywords); // sorts newKeywords by timeStamp
 
-            for (Card_Keywords ck : newKeywords) {
+            for (CardKeywords ck : newKeywords) {
 
                 if (ck.isRemoveAllKeywords()) {
                     keywords.clear();

src/main/java/forge/CardKeywords.java

@@ -10,7 +10,7 @@ import java.util.ArrayList;
  * @author Forge
  * @version $Id: Card_Keywords.java 10217 2011-09-04 10:14:19Z Sloth $
  */
-public class Card_Keywords implements Comparable<Card_Keywords> {
+public class CardKeywords implements Comparable<CardKeywords> {
     // takes care of individual card types
     private ArrayList<String> keywords = new ArrayList<String>();
     private ArrayList<String> removeKeywords = new ArrayList<String>();
@@ -41,7 +41,7 @@ public class Card_Keywords implements Comparable<Card_Keywords> {
      * @param stamp
      *            a long
      */
-    Card_Keywords(final ArrayList<String> keywordList, final ArrayList<String> removeKeywordList,
+    CardKeywords(final ArrayList<String> keywordList, final ArrayList<String> removeKeywordList,
             final boolean removeAll, final long stamp) {
         keywords = keywordList;
         removeKeywords = removeKeywordList;
@@ -85,7 +85,7 @@ public class Card_Keywords implements Comparable<Card_Keywords> {
      * @see java.lang.Comparable#compareTo(java.lang.Object)
      */
     @Override
-    public final int compareTo(final Card_Keywords anotherCardKeywords) {
+    public final int compareTo(final CardKeywords anotherCardKeywords) {
         int returnValue = 0;
         long anotherTimeStamp = anotherCardKeywords.getTimestamp();
         if (this.timeStamp < anotherTimeStamp) {

src/main/java/forge/CardType.java

@@ -10,7 +10,7 @@ import java.util.ArrayList;
  * @author Forge
  * @version $Id$
  */
-public class Card_Type implements Comparable<Card_Type> {
+public class CardType implements Comparable<CardType> {
     // takes care of individual card types
     private ArrayList<String> type = new ArrayList<String>();
     private ArrayList<String> removeType = new ArrayList<String>();
@@ -49,7 +49,7 @@ public class Card_Type implements Comparable<Card_Type> {
      * @param stamp
      *            a long
      */
-    Card_Type(final ArrayList<String> types, final ArrayList<String> removeTypes, final boolean removeSuperType,
+    CardType(final ArrayList<String> types, final ArrayList<String> removeTypes, final boolean removeSuperType,
             final boolean removeCardType, final boolean removeSubType, final boolean removeCreatureType,
             final long stamp) {
         type = types;
@@ -127,7 +127,7 @@ public class Card_Type implements Comparable<Card_Type> {
      * @see java.lang.Comparable#compareTo(java.lang.Object)
      */
     @Override
-    public final int compareTo(final Card_Type anotherCardType) {
+    public final int compareTo(final CardType anotherCardType) {
         int returnValue = 0;
         long anotherTimeStamp = anotherCardType.getTimestamp();
         if (this.timeStamp < anotherTimeStamp) {

src/main/java/forge/ComputerAIGeneral.java

@@ -19,14 +19,14 @@ import forge.card.spellability.Spell_Permanent;
  * @author Forge
  * @version $Id$
  */
-public class ComputerAI_General implements Computer {
+public class ComputerAIGeneral implements Computer {
 
     /**
      * <p>
      * Constructor for ComputerAI_General.
      * </p>
      */
-    public ComputerAI_General() {
+    public ComputerAIGeneral() {
 
     }
 
@@ -416,7 +416,7 @@ public class ComputerAI_General implements Computer {
     public final void declareBlockers() {
         CardList blockers = AllZoneUtil.getCreaturesInPlay(AllZone.getComputerPlayer());
 
-        AllZone.setCombat(ComputerUtil_Block2.getBlockers(AllZone.getCombat(), blockers));
+        AllZone.setCombat(ComputerUtilBlock2.getBlockers(AllZone.getCombat(), blockers));
 
         CombatUtil.showCombat();
 

src/main/java/forge/ComputerAIInput.java

@@ -12,7 +12,7 @@ import forge.gui.input.Input;
  * @author Forge
  * @version $Id$
  */
-public class ComputerAI_Input extends Input {
+public class ComputerAIInput extends Input {
     /** Constant <code>serialVersionUID=-3091338639571662216L</code>. */
     private static final long serialVersionUID = -3091338639571662216L;
 
@@ -26,7 +26,7 @@ public class ComputerAI_Input extends Input {
      * @param iComputer
      *            a {@link forge.Computer} object.
      */
-    public ComputerAI_Input(final Computer iComputer) {
+    public ComputerAIInput(final Computer iComputer) {
         computer = iComputer;
     }
 

src/main/java/forge/ComputerUtil.java

@@ -1402,7 +1402,7 @@ public class ComputerUtil {
      * @return a {@link forge.Combat} object.
      */
     public static Combat getAttackers() {
-        ComputerUtil_Attack2 att = new ComputerUtil_Attack2(AllZone.getComputerPlayer().getCardsIn(Zone.Battlefield),
+        ComputerUtilAttack2 att = new ComputerUtilAttack2(AllZone.getComputerPlayer().getCardsIn(Zone.Battlefield),
                 AllZone.getHumanPlayer().getCardsIn(Zone.Battlefield), AllZone.getHumanPlayer().getLife());
 
         return att.getAttackers();
@@ -1418,7 +1418,7 @@ public class ComputerUtil {
     public static Combat getBlockers() {
         CardList blockers = AllZone.getComputerPlayer().getCardsIn(Zone.Battlefield);
 
-        return ComputerUtil_Block2.getBlockers(AllZone.getCombat(), blockers);
+        return ComputerUtilBlock2.getBlockers(AllZone.getCombat(), blockers);
     }
 
     /**

src/main/java/forge/ComputerUtilAttack2.java

@@ -17,7 +17,7 @@ import forge.card.trigger.Trigger;
  * @author Forge
  * @version $Id$
  */
-public class ComputerUtil_Attack2 {
+public class ComputerUtilAttack2 {
 
     // possible attackers and blockers
     private CardList attackers;
@@ -46,7 +46,7 @@ public class ComputerUtil_Attack2 {
      * @param blockerLife
      *            a int.
      */
-    public ComputerUtil_Attack2(final Card[] possibleAttackers, final Card[] possibleBlockers, final int blockerLife) {
+    public ComputerUtilAttack2(final Card[] possibleAttackers, final Card[] possibleBlockers, final int blockerLife) {
         this(new CardList(possibleAttackers), new CardList(possibleBlockers), blockerLife);
     }
 
@@ -62,7 +62,7 @@ public class ComputerUtil_Attack2 {
      * @param blockerLife
      *            a int.
      */
-    public ComputerUtil_Attack2(final CardList possibleAttackers,
+    public ComputerUtilAttack2(final CardList possibleAttackers,
             final CardList possibleBlockers, final int blockerLife) {
         humanList = new CardList(possibleBlockers.toArray());
         humanList = humanList.getType("Creature");

src/main/java/forge/ComputerUtilBlock2.java

@@ -12,7 +12,7 @@ import forge.card.cardFactory.CardFactoryUtil;
  * @author Forge
  * @version $Id$
  */
-public class ComputerUtil_Block2 {
+public class ComputerUtilBlock2 {
     /** Constant <code>attackers</code>. */
     private static CardList attackers = new CardList(); // all attackers
     /** Constant <code>attackersLeft</code>. */
@@ -147,7 +147,7 @@ public class ComputerUtil_Block2 {
      *            a int.
      */
     private static void setDiff(final int diff) {
-        ComputerUtil_Block2.diff = (diff);
+        ComputerUtilBlock2.diff = (diff);
     }
 
     // finds the creatures able to block the attacker

src/main/java/forge/Constant.java

@@ -302,34 +302,34 @@ public interface Constant {
         boolean[] LOADED = { false };
 
         /** The card types. */
-        Constant_StringArrayList[] CARD_TYPES = new Constant_StringArrayList[1];
+        ConstantStringArrayList[] CARD_TYPES = new ConstantStringArrayList[1];
 
         /** The super types. */
-        Constant_StringArrayList[] SUPER_TYPES = new Constant_StringArrayList[1];
+        ConstantStringArrayList[] SUPER_TYPES = new ConstantStringArrayList[1];
 
         /** The basic types. */
-        Constant_StringArrayList[] BASIC_TYPES = new Constant_StringArrayList[1];
+        ConstantStringArrayList[] BASIC_TYPES = new ConstantStringArrayList[1];
 
         /** The land types. */
-        Constant_StringArrayList[] LAND_TYPES = new Constant_StringArrayList[1];
+        ConstantStringArrayList[] LAND_TYPES = new ConstantStringArrayList[1];
 
         /** The creature types. */
-        Constant_StringArrayList[] CREATURE_TYPES = new Constant_StringArrayList[1];
+        ConstantStringArrayList[] CREATURE_TYPES = new ConstantStringArrayList[1];
 
         /** The instant types. */
-        Constant_StringArrayList[] INSTANT_TYPES = new Constant_StringArrayList[1];
+        ConstantStringArrayList[] INSTANT_TYPES = new ConstantStringArrayList[1];
 
         /** The sorcery types. */
-        Constant_StringArrayList[] SORCERY_TYPES = new Constant_StringArrayList[1];
+        ConstantStringArrayList[] SORCERY_TYPES = new ConstantStringArrayList[1];
 
         /** The enchantment types. */
-        Constant_StringArrayList[] ENCHANTMENT_TYPES = new Constant_StringArrayList[1];
+        ConstantStringArrayList[] ENCHANTMENT_TYPES = new ConstantStringArrayList[1];
 
         /** The artifact types. */
-        Constant_StringArrayList[] ARTIFACT_TYPES = new Constant_StringArrayList[1];
+        ConstantStringArrayList[] ARTIFACT_TYPES = new ConstantStringArrayList[1];
 
         /** The walker types. */
-        Constant_StringArrayList[] WALKER_TYPES = new Constant_StringArrayList[1];
+        ConstantStringArrayList[] WALKER_TYPES = new ConstantStringArrayList[1];
     }
 
     /**
@@ -341,7 +341,7 @@ public interface Constant {
         boolean[] LOADED = { false };
 
         /** The Non stacking list. */
-        Constant_StringArrayList[] NON_STACKING_LIST = new Constant_StringArrayList[1];
+        ConstantStringArrayList[] NON_STACKING_LIST = new ConstantStringArrayList[1];
     }
 
 } // Constant

src/main/java/forge/ConstantStringArrayList.java

@@ -5,7 +5,7 @@ import java.util.ArrayList;
 /**
  * The Class Constant_StringArrayList.
  */
-public class Constant_StringArrayList {
+public class ConstantStringArrayList {
 
     /** The list. */
     private ArrayList<String> list = new ArrayList<String>();

src/main/java/forge/ConstantStringHashMap.java

@@ -6,7 +6,7 @@ import java.util.Map;
 /**
  * The Class Constant_StringHashMap.
  */
-public class Constant_StringHashMap {
+public class ConstantStringHashMap {
 
     /** The map. */
     private Map<String, String> map = new HashMap<String, String>();

src/main/java/forge/GuiDisplay4.java

@@ -168,7 +168,7 @@ public class GuiDisplay4 extends JFrame implements CardContainer, Display, NewCo
         if (damage <= 0) {
             return;
         }
-        new Gui_MultipleBlockers4(attacker, blockers, damage, this);
+        new GuiMultipleBlockers4(attacker, blockers, damage, this);
     }
 
     /**

src/main/java/forge/GuiDownloadPicturesLQ.java

@@ -16,7 +16,7 @@ import forge.properties.ForgeProps;
  * @author Forge
  * @version $Id$
  */
-public class Gui_DownloadPictures_LQ extends GuiDownloader {
+public class GuiDownloadPicturesLQ extends GuiDownloader {
 
     private static final long serialVersionUID = -2839597792999139007L;
 
@@ -28,7 +28,7 @@ public class Gui_DownloadPictures_LQ extends GuiDownloader {
      * @param frame
      *            a array of {@link javax.swing.JFrame} objects.
      */
-    public Gui_DownloadPictures_LQ(final JFrame frame) {
+    public GuiDownloadPicturesLQ(final JFrame frame) {
         super(frame);
     }
 

src/main/java/forge/GuiDownloadPrices.java

@@ -32,7 +32,7 @@ import forge.properties.NewConstants.Quest;
  * @author Forge
  * @version $Id$
  */
-public class Gui_DownloadPrices extends JFrame {
+public class GuiDownloadPrices extends JFrame {
 
     /** Constant <code>serialVersionUID=1L</code>. */
     private static final long serialVersionUID = 1L;
@@ -42,7 +42,7 @@ public class Gui_DownloadPrices extends JFrame {
     /**
      * This is the default constructor.
      */
-    public Gui_DownloadPrices() {
+    public GuiDownloadPrices() {
         super();
         initialize();
     }
@@ -85,7 +85,7 @@ public class Gui_DownloadPrices extends JFrame {
             jButton.addActionListener(new java.awt.event.ActionListener() {
                 public void actionPerformed(final java.awt.event.ActionEvent e) {
                     if (jButton.getText().equals("Done!")) {
-                        Gui_DownloadPrices.this.dispose();
+                        GuiDownloadPrices.this.dispose();
                     }
 
                     BufferedInputStream in = null;

src/main/java/forge/GuiDownloadQuestImages.java

@@ -35,7 +35,7 @@ public class GuiDownloadQuestImages extends GuiDownloader {
      * getNeededCards.
      * </p>
      * 
-     * @return an array of {@link forge.Gui_DownloadSetPictures_LQ}
+     * @return an array of {@link forge.GuiDownloadSetPicturesLQ}
      *         objects.
      */
     protected final DownloadObject[] getNeededImages() {

src/main/java/forge/GuiDownloadSetPicturesLQ.java

@@ -20,7 +20,7 @@ import forge.properties.ForgeProps;
  * @author Forge
  * @version $Id$
  */
-public class Gui_DownloadSetPictures_LQ extends GuiDownloader {
+public class GuiDownloadSetPicturesLQ extends GuiDownloader {
 
     private static final long serialVersionUID = -7890794857949935256L;
 
@@ -32,7 +32,7 @@ public class Gui_DownloadSetPictures_LQ extends GuiDownloader {
      * @param frame
      *            a {@link javax.swing.JFrame} object.
      */
-    public Gui_DownloadSetPictures_LQ(final JFrame frame) {
+    public GuiDownloadSetPicturesLQ(final JFrame frame) {
         super(frame);
     }
 

src/main/java/forge/GuiImportPicture.java

@@ -35,7 +35,7 @@ import forge.properties.NewConstants;
  * @author Forge
  * @version $Id$
  */
-public class GUI_ImportPicture extends JDialog implements NewConstants {
+public class GuiImportPicture extends JDialog implements NewConstants {
     /** Constant <code>serialVersionUID=-4191539152208389089L</code>. */
     private static final long serialVersionUID = -4191539152208389089L;
     private JPanel jContentPane = null;
@@ -48,7 +48,7 @@ public class GUI_ImportPicture extends JDialog implements NewConstants {
     private JButton jButtonStart = null;
 
     /** The frame. */
-    private GUI_ImportPicture frame;
+    private GuiImportPicture frame;
     private JLabel jLabelHDDFree = null;
     private JLabel jLabelNeedSpace = null;
 
@@ -69,7 +69,7 @@ public class GUI_ImportPicture extends JDialog implements NewConstants {
      * @param owner
      *            a {@link javax.swing.JFrame} object.
      */
-    public GUI_ImportPicture(final JFrame owner) {
+    public GuiImportPicture(final JFrame owner) {
         super(owner);
         frame = this;
         initialize();

src/main/java/forge/GuiMigrateLocalMWSSetPicturesHQ.java

@@ -52,7 +52,7 @@ import forge.properties.NewConstants.Lang.GuiDownloadPictures;
  * @author Forge
  * @version $Id$
  */
-public final class Gui_MigrateLocalMWSSetPictures_HQ extends DefaultBoundedRangeModel implements Runnable,
+public final class GuiMigrateLocalMWSSetPicturesHQ extends DefaultBoundedRangeModel implements Runnable,
         NewConstants, NewConstants.Lang.GuiDownloadPictures {
 
     /** Constant <code>serialVersionUID=-7890794857949935256L</code>. */
@@ -117,9 +117,9 @@ public final class Gui_MigrateLocalMWSSetPictures_HQ extends DefaultBoundedRange
      * 
      * @param c
      *            an array of
-     *            {@link forge.Gui_MigrateLocalMWSSetPictures_HQ.MCard} objects.
+     *            {@link forge.GuiMigrateLocalMWSSetPicturesHQ.MCard} objects.
      */
-    private Gui_MigrateLocalMWSSetPictures_HQ(final MCard[] c) {
+    private GuiMigrateLocalMWSSetPicturesHQ(final MCard[] c) {
         this.cards = c;
         this.addr = new JTextField(ForgeProps.getLocalized(GuiDownloadPictures.PROXY_ADDRESS));
         this.port = new JTextField(ForgeProps.getLocalized(GuiDownloadPictures.PROXY_PORT));
@@ -133,7 +133,7 @@ public final class Gui_MigrateLocalMWSSetPictures_HQ extends DefaultBoundedRange
         final String[] labels = { ForgeProps.getLocalized(GuiDownloadPictures.NO_PROXY),
                 ForgeProps.getLocalized(GuiDownloadPictures.HTTP_PROXY),
                 ForgeProps.getLocalized(GuiDownloadPictures.SOCKS_PROXY) };
-        for (int i = 0; i < Gui_MigrateLocalMWSSetPictures_HQ.TYPES.length; i++) {
+        for (int i = 0; i < GuiMigrateLocalMWSSetPicturesHQ.TYPES.length; i++) {
             final JRadioButton rb = new JRadioButton(labels[i]);
             rb.addChangeListener(new ProxyHandler(i));
             bg.add(rb);
@@ -161,7 +161,7 @@ public final class Gui_MigrateLocalMWSSetPictures_HQ extends DefaultBoundedRange
 
             @Override
             public void actionPerformed(final ActionEvent e) {
-                new Thread(Gui_MigrateLocalMWSSetPictures_HQ.this).start();
+                new Thread(GuiMigrateLocalMWSSetPicturesHQ.this).start();
                 b.setEnabled(false);
             }
         });
@@ -246,16 +246,16 @@ public final class Gui_MigrateLocalMWSSetPictures_HQ extends DefaultBoundedRange
              */
             @Override
             public void run() {
-                Gui_MigrateLocalMWSSetPictures_HQ.this.fireStateChanged();
+                GuiMigrateLocalMWSSetPicturesHQ.this.fireStateChanged();
 
                 final StringBuilder sb = new StringBuilder();
 
-                final int a = Gui_MigrateLocalMWSSetPictures_HQ.this.getAverageTimePerCard();
+                final int a = GuiMigrateLocalMWSSetPicturesHQ.this.getAverageTimePerCard();
 
-                if (this.card != Gui_MigrateLocalMWSSetPictures_HQ.this.cards.length) {
+                if (this.card != GuiMigrateLocalMWSSetPicturesHQ.this.cards.length) {
-                    sb.append(this.card + "/" + Gui_MigrateLocalMWSSetPictures_HQ.this.cards.length + " - ");
+                    sb.append(this.card + "/" + GuiMigrateLocalMWSSetPicturesHQ.this.cards.length + " - ");
 
-                    long t2Go = (Gui_MigrateLocalMWSSetPictures_HQ.this.cards.length - this.card) * a;
+                    long t2Go = (GuiMigrateLocalMWSSetPicturesHQ.this.cards.length - this.card) * a;
 
                     boolean secOnly = true;
                     if (t2Go > 3600000) {
@@ -275,14 +275,14 @@ public final class Gui_MigrateLocalMWSSetPictures_HQ extends DefaultBoundedRange
                     }
                 } else {
                     sb.append(String.format(ForgeProps.getLocalized(GuiDownloadPictures.BAR_CLOSE), this.card,
-                            Gui_MigrateLocalMWSSetPictures_HQ.this.cards.length));
+                            GuiMigrateLocalMWSSetPicturesHQ.this.cards.length));
                 }
 
-                Gui_MigrateLocalMWSSetPictures_HQ.this.bar.setString(sb.toString());
+                GuiMigrateLocalMWSSetPicturesHQ.this.bar.setString(sb.toString());
                 // bar.setString(String.format(ForgeProps.getLocalized(card ==
                 // cards.length? BAR_CLOSE:BAR_WAIT), card,
                 // cards.length));
-                System.out.println(this.card + "/" + Gui_MigrateLocalMWSSetPictures_HQ.this.cards.length + " - " + a);
+                System.out.println(this.card + "/" + GuiMigrateLocalMWSSetPicturesHQ.this.cards.length + " - " + a);
             }
         }
         EventQueue.invokeLater(new Worker(card));
@@ -339,7 +339,7 @@ public final class Gui_MigrateLocalMWSSetPictures_HQ extends DefaultBoundedRange
             p = Proxy.NO_PROXY;
         } else {
             try {
-                p = new Proxy(Gui_MigrateLocalMWSSetPictures_HQ.TYPES[this.type], new InetSocketAddress(
+                p = new Proxy(GuiMigrateLocalMWSSetPicturesHQ.TYPES[this.type], new InetSocketAddress(
                         this.addr.getText(), Integer.parseInt(this.port.getText())));
             } catch (final Exception ex) {
                 ErrorViewer.showError(ex, ForgeProps.getLocalized(Errors.PROXY_CONNECT), this.addr.getText(),
@@ -439,14 +439,14 @@ public final class Gui_MigrateLocalMWSSetPictures_HQ extends DefaultBoundedRange
      *            a {@link javax.swing.JFrame} object.
      */
     public static void startDownload(final JFrame frame) {
-        final MCard[] card = Gui_MigrateLocalMWSSetPictures_HQ.getNeededCards();
+        final MCard[] card = GuiMigrateLocalMWSSetPicturesHQ.getNeededCards();
 
         if (card.length == 0) {
             JOptionPane.showMessageDialog(frame, ForgeProps.getLocalized(GuiDownloadPictures.NO_MORE));
             return;
         }
 
-        final Gui_MigrateLocalMWSSetPictures_HQ download = new Gui_MigrateLocalMWSSetPictures_HQ(card);
+        final GuiMigrateLocalMWSSetPicturesHQ download = new GuiMigrateLocalMWSSetPicturesHQ(card);
         final JDialog dlg = download.getDlg(frame);
         dlg.setVisible(true);
         dlg.dispose();
@@ -458,7 +458,7 @@ public final class Gui_MigrateLocalMWSSetPictures_HQ extends DefaultBoundedRange
      * getNeededCards.
      * </p>
      * 
-     * @return an array of {@link forge.Gui_MigrateLocalMWSSetPictures_HQ.MCard}
+     * @return an array of {@link forge.GuiMigrateLocalMWSSetPicturesHQ.MCard}
      *         objects.
      */
     private static MCard[] getNeededCards() {
@@ -578,9 +578,9 @@ public final class Gui_MigrateLocalMWSSetPictures_HQ extends DefaultBoundedRange
         @Override
         public void stateChanged(final ChangeEvent e) {
             if (((AbstractButton) e.getSource()).isSelected()) {
-                Gui_MigrateLocalMWSSetPictures_HQ.this.type = this.type;
+                GuiMigrateLocalMWSSetPicturesHQ.this.type = this.type;
-                Gui_MigrateLocalMWSSetPictures_HQ.this.addr.setEnabled(this.type != 0);
+                GuiMigrateLocalMWSSetPicturesHQ.this.addr.setEnabled(this.type != 0);
-                Gui_MigrateLocalMWSSetPictures_HQ.this.port.setEnabled(this.type != 0);
+                GuiMigrateLocalMWSSetPicturesHQ.this.port.setEnabled(this.type != 0);
             }
         }
     }

src/main/java/forge/GuiMultipleBlockers4.java

@@ -26,7 +26,7 @@ import forge.gui.game.CardPanel;
  * very hacky.
  * 
  */
-class Gui_MultipleBlockers4 extends JFrame {
+class GuiMultipleBlockers4 extends JFrame {
     /** Constant <code>serialVersionUID=7622818310877381045L</code>. */
     private static final long serialVersionUID = 7622818310877381045L;
 
@@ -57,7 +57,7 @@ class Gui_MultipleBlockers4 extends JFrame {
      * @param display
      *            a {@link forge.CardContainer} object.
      */
-    Gui_MultipleBlockers4(final Card attacker, final CardList creatureList,
+    GuiMultipleBlockers4(final Card attacker, final CardList creatureList,
             final int damage, final CardContainer display) {
         this();
         assignDamage = damage;
@@ -90,7 +90,7 @@ class Gui_MultipleBlockers4 extends JFrame {
      * Constructor for Gui_MultipleBlockers4.
      * </p>
      */
-    public Gui_MultipleBlockers4() {
+    public GuiMultipleBlockers4() {
         try {
             jbInit();
         } catch (Exception ex) {

src/main/java/forge/GuiNewGame.java

@@ -7,12 +7,12 @@ package forge;
  * {@link forge.view.swing.OldGuiNewGame}, which is slowly being refactored out
  * of existence.
  */
-public final class Gui_NewGame {
+public final class GuiNewGame {
 
     /**
      * Do not instantiate.
      */
-    private Gui_NewGame() {
+    private GuiNewGame() {
         // blank
     }
 

src/main/java/forge/GuiProgressBarWindow.java

@@ -16,7 +16,7 @@ import javax.swing.border.EmptyBorder;
  * @version $Id$
  * @since 1.0.15
  */
-public class Gui_ProgressBarWindow extends JDialog {
+public class GuiProgressBarWindow extends JDialog {
 
     /**
      *
@@ -28,7 +28,7 @@ public class Gui_ProgressBarWindow extends JDialog {
     /**
      * Create the dialog.
      */
-    public Gui_ProgressBarWindow() {
+    public GuiProgressBarWindow() {
         setResizable(false);
         setTitle("Some Progress");
         Dimension screen = this.getToolkit().getScreenSize();

src/main/java/forge/gui/MultiPhaseProgressMonitorWithETA.java

@@ -8,7 +8,7 @@ import javax.swing.WindowConstants;
 
 import net.slightlymagic.braids.util.UtilFunctions;
 import net.slightlymagic.braids.util.progress_monitor.BaseProgressMonitor;
-import forge.Gui_ProgressBarWindow;
+import forge.GuiProgressBarWindow;
 
 /**
  * GUI Progress Monitor that displays the ETA (Estimated Time of Arrival or
@@ -19,7 +19,7 @@ import forge.Gui_ProgressBarWindow;
  */
 public class MultiPhaseProgressMonitorWithETA extends BaseProgressMonitor {
 
-    private transient Gui_ProgressBarWindow dialog;
+    private transient GuiProgressBarWindow dialog;
     private transient String title;
 
     /**
@@ -218,7 +218,7 @@ public class MultiPhaseProgressMonitorWithETA extends BaseProgressMonitor {
                                 MultiPhaseProgressMonitorWithETA.this.dialog = null;
                             }
 
-                            MultiPhaseProgressMonitorWithETA.this.dialog = new Gui_ProgressBarWindow();
+                            MultiPhaseProgressMonitorWithETA.this.dialog = new GuiProgressBarWindow();
                         }
                     });
         }

src/main/java/forge/gui/input/InputControl.java

@@ -3,7 +3,7 @@ package forge.gui.input;
 import java.util.LinkedList;
 import java.util.Stack;
 
-import forge.ComputerAI_Input;
+import forge.ComputerAIInput;
 import forge.Constant;
 import forge.MyObservable;
 import forge.Phase;
@@ -31,7 +31,7 @@ public class InputControl extends MyObservable implements java.io.Serializable {
     private final LinkedList<Input> resolvingQueue = new LinkedList<Input>();
 
     private final FModel model;
-    private ComputerAI_Input aiInput; // initialized at runtime to be the latest
+    private ComputerAIInput aiInput; // initialized at runtime to be the latest
                                       // object created
 
     /**
@@ -250,7 +250,7 @@ public class InputControl extends MyObservable implements java.io.Serializable {
      * @param computerAI_Input
      *            the new computer
      */
-    public final void setComputer(final ComputerAI_Input computerAI_Input) {
+    public final void setComputer(final ComputerAIInput computerAI_Input) {
         this.aiInput = computerAI_Input;
     }
 } // InputControl

src/main/java/forge/view/swing/ApplicationView.java

@@ -10,8 +10,8 @@ import arcane.ui.util.ManaSymbols;
 import com.esotericsoftware.minlog.Log;
 
 import forge.AllZone;
-import forge.ComputerAI_General;
+import forge.ComputerAIGeneral;
-import forge.ComputerAI_Input;
+import forge.ComputerAIInput;
 import forge.Constant;
 import forge.ImageCache;
 import forge.error.ErrorViewer;
@@ -155,7 +155,7 @@ public class ApplicationView implements FView {
                                                             // web app
                             @Override
                             public void run() {
-                                AllZone.getInputControl().setComputer(new ComputerAI_Input(new ComputerAI_General()));
+                                AllZone.getInputControl().setComputer(new ComputerAIInput(new ComputerAIGeneral()));
 
                                 // Enable only one of the following two lines.
                                 // The second

src/main/java/forge/view/swing/Gui_HomeScreen.java

@@ -40,10 +40,10 @@ import org.eclipse.wb.swing.FocusTraversalOnArray;
 import forge.AllZone;
 import forge.Command;
 import forge.Constant;
-import forge.GUI_ImportPicture;
+import forge.GuiImportPicture;
 import forge.GuiDisplay4;
-import forge.Gui_DownloadPrices;
+import forge.GuiDownloadPrices;
-import forge.Gui_DownloadSetPictures_LQ;
+import forge.GuiDownloadSetPicturesLQ;
 import forge.MyRandom;
 import forge.PlayerType;
 import forge.Singletons;
@@ -760,7 +760,7 @@ public class Gui_HomeScreen {
         this.cmdDownloadLQSetPics.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(final ActionEvent arg0) {
-                new Gui_DownloadSetPictures_LQ(null);
+                new GuiDownloadSetPicturesLQ(null);
             }
         });
         this.pnlUtilities.add(this.cmdDownloadLQSetPics);
@@ -769,7 +769,7 @@ public class Gui_HomeScreen {
         this.cmdDownloadPrices.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(final ActionEvent arg0) {
-                final Gui_DownloadPrices gdp = new Gui_DownloadPrices();
+                final GuiDownloadPrices gdp = new GuiDownloadPrices();
                 gdp.setVisible(true);
             }
         });
@@ -779,7 +779,7 @@ public class Gui_HomeScreen {
         this.cmdImportPics.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(final ActionEvent arg0) {
-                final GUI_ImportPicture ip = new GUI_ImportPicture(null);
+                final GuiImportPicture ip = new GuiImportPicture(null);
                 ip.setVisible(true);
             }
         });

src/main/java/forge/view/swing/OldGuiNewGame.java

@@ -47,14 +47,14 @@ import com.esotericsoftware.minlog.Log;
 import forge.AllZone;
 import forge.Command;
 import forge.Constant;
-import forge.Constant_StringArrayList;
+import forge.ConstantStringArrayList;
 import forge.FileUtil;
-import forge.GUI_ImportPicture;
+import forge.GuiImportPicture;
 import forge.GuiDisplay4;
 import forge.GuiDownloadQuestImages;
-import forge.Gui_DownloadPictures_LQ;
+import forge.GuiDownloadPicturesLQ;
-import forge.Gui_DownloadPrices;
+import forge.GuiDownloadPrices;
-import forge.Gui_DownloadSetPictures_LQ;
+import forge.GuiDownloadSetPicturesLQ;
 import forge.ImageCache;
 import forge.MyRandom;
 import forge.PlayerType;
@@ -1117,7 +1117,7 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
          */
         @Override
         public final void actionPerformed(final ActionEvent e) {
-            final Gui_DownloadPrices gdp = new Gui_DownloadPrices();
+            final GuiDownloadPrices gdp = new GuiDownloadPrices();
             gdp.setVisible(true);
         }
     }
@@ -1205,7 +1205,7 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
          */
         @Override
         public final void actionPerformed(final ActionEvent e) {
-            new Gui_DownloadPictures_LQ(null);
+            new GuiDownloadPicturesLQ(null);
         }
     }
 
@@ -1239,7 +1239,7 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
          */
         @Override
         public final void actionPerformed(final ActionEvent e) {
-            new Gui_DownloadSetPictures_LQ(null);
+            new GuiDownloadSetPicturesLQ(null);
         }
     }
 
@@ -1309,7 +1309,7 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
          */
         @Override
         public final void actionPerformed(final ActionEvent e) {
-            final GUI_ImportPicture ip = new GUI_ImportPicture(null);
+            final GuiImportPicture ip = new GuiImportPicture(null);
             ip.setVisible(true);
         }
     }
@@ -1758,16 +1758,16 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
 
             ArrayList<String> tList = null;
 
-            Constant.CardTypes.CARD_TYPES[0] = new Constant_StringArrayList();
+            Constant.CardTypes.CARD_TYPES[0] = new ConstantStringArrayList();
-            Constant.CardTypes.SUPER_TYPES[0] = new Constant_StringArrayList();
+            Constant.CardTypes.SUPER_TYPES[0] = new ConstantStringArrayList();
-            Constant.CardTypes.BASIC_TYPES[0] = new Constant_StringArrayList();
+            Constant.CardTypes.BASIC_TYPES[0] = new ConstantStringArrayList();
-            Constant.CardTypes.LAND_TYPES[0] = new Constant_StringArrayList();
+            Constant.CardTypes.LAND_TYPES[0] = new ConstantStringArrayList();
-            Constant.CardTypes.CREATURE_TYPES[0] = new Constant_StringArrayList();
+            Constant.CardTypes.CREATURE_TYPES[0] = new ConstantStringArrayList();
-            Constant.CardTypes.INSTANT_TYPES[0] = new Constant_StringArrayList();
+            Constant.CardTypes.INSTANT_TYPES[0] = new ConstantStringArrayList();
-            Constant.CardTypes.SORCERY_TYPES[0] = new Constant_StringArrayList();
+            Constant.CardTypes.SORCERY_TYPES[0] = new ConstantStringArrayList();
-            Constant.CardTypes.ENCHANTMENT_TYPES[0] = new Constant_StringArrayList();
+            Constant.CardTypes.ENCHANTMENT_TYPES[0] = new ConstantStringArrayList();
-            Constant.CardTypes.ARTIFACT_TYPES[0] = new Constant_StringArrayList();
+            Constant.CardTypes.ARTIFACT_TYPES[0] = new ConstantStringArrayList();
-            Constant.CardTypes.WALKER_TYPES[0] = new Constant_StringArrayList();
+            Constant.CardTypes.WALKER_TYPES[0] = new ConstantStringArrayList();
 
             if (typeListFile.size() > 0) {
                 for (int i = 0; i < typeListFile.size(); i++) {
@@ -1837,7 +1837,7 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
         if (!Constant.Keywords.LOADED[0]) {
             final ArrayList<String> nskwListFile = FileUtil.readFile("res/gamedata/NonStackingKWList.txt");
 
-            Constant.Keywords.NON_STACKING_LIST[0] = new Constant_StringArrayList();
+            Constant.Keywords.NON_STACKING_LIST[0] = new ConstantStringArrayList();
 
             if (nskwListFile.size() > 1) {
                 for (int i = 0; i < nskwListFile.size(); i++) {

src/test/java/forge/GuiDownloadPicturesLQTest.java

@@ -15,6 +15,6 @@ public class GuiDownloadPicturesLQTest {
      */
     @Test(enabled = false, timeOut = 1000)
     public  void GuiDownloadPicturesTest1() {
-        new Gui_DownloadPictures_LQ(null);
+        new GuiDownloadPicturesLQ(null);
     }
 }

src/test/java/forge/GuiDownloadSetPicturesLQTest.java

@@ -13,6 +13,6 @@ public class GuiDownloadSetPicturesLQTest {
      */
     @Test(enabled = false, timeOut = 1000)
     public void GuiDownloadSetPicturesLQTest1() {
-        new Gui_DownloadSetPictures_LQ(null);
+        new GuiDownloadSetPicturesLQ(null);
     }
 }

src/test/java/forge/GuiMigrateLocalMWSSetPicturesHQTest.java

@@ -15,6 +15,6 @@ public class GuiMigrateLocalMWSSetPicturesHQTest {
      */
     @Test(enabled = false, timeOut = 1000)
     public  void GuiMigrateLocalMWSSetPicturesHQ1() {
-        Gui_MigrateLocalMWSSetPictures_HQ.startDownload(null);
+        GuiMigrateLocalMWSSetPicturesHQ.startDownload(null);
     }
 }

src/test/java/forge/GuiMultipleBlockers4Test.java

@@ -22,7 +22,7 @@ public class GuiMultipleBlockers4Test {
         list.add(AllZone.getCardFactory().getCard("Frostling", null));
 
         for (int i = 0; i < 2; i++) {
-            new Gui_MultipleBlockers4(null, list, i + 1, null);
+            new GuiMultipleBlockers4(null, list, i + 1, null);
         }
     }
 }

src/test/java/forge/GuiProgressBarWindowTest.java

@@ -18,7 +18,7 @@ public class GuiProgressBarWindowTest {
     @Test(groups = {"UnitTest", "fast"})
     public void GuiProgressBarWindowTest1() {
         try {
-            Gui_ProgressBarWindow dialog = new Gui_ProgressBarWindow();
+            GuiProgressBarWindow dialog = new GuiProgressBarWindow();
             dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
             dialog.setVisible(true);
             Assert.assertNotNull(dialog);