* Release Mage 1.1.0 final

Mage.Client/src/main/java/mage/client/MageFrame.java

@@ -30,6 +30,58 @@ package mage.client;
 import de.schlichtherle.truezip.file.TArchiveDetector;
 import de.schlichtherle.truezip.file.TConfig;
 import de.schlichtherle.truezip.fs.FsOutputOption;
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Cursor;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Rectangle;
+import java.awt.SplashScreen;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.image.BufferedImage;
+import java.beans.PropertyVetoException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.prefs.Preferences;
+import javax.imageio.ImageIO;
+import javax.swing.AbstractButton;
+import javax.swing.Box;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JComponent;
+import javax.swing.JDesktopPane;
+import javax.swing.JEditorPane;
+import javax.swing.JFrame;
+import javax.swing.JInternalFrame;
+import javax.swing.JLabel;
+import javax.swing.JLayeredPane;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JToggleButton;
+import javax.swing.JToolBar.Separator;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.WindowConstants;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
 import mage.cards.decks.Deck;
 import mage.cards.repository.CardCriteria;
 import mage.cards.repository.CardInfo;
@@ -45,7 +97,13 @@ import mage.client.components.tray.MageTray;
 import mage.client.constants.Constants.DeckEditorMode;
 import mage.client.deckeditor.DeckEditorPane;
 import mage.client.deckeditor.collection.viewer.CollectionViewerPane;
-import mage.client.dialog.*;
+import mage.client.dialog.AboutDialog;
+import mage.client.dialog.ConnectDialog;
+import mage.client.dialog.ErrorDialog;
+import mage.client.dialog.FeedbackDialog;
+import mage.client.dialog.GameEndDialog;
+import mage.client.dialog.PreferencesDialog;
+import mage.client.dialog.TableWaitingDialog;
 import mage.client.draft.DraftPane;
 import mage.client.draft.DraftPanel;
 import mage.client.game.GamePane;
@@ -56,9 +114,9 @@ import mage.client.table.TablesPane;
 import mage.client.tournament.TournamentPane;
 import mage.client.tournament.TournamentPanel;
 import mage.client.util.EDTExceptionHandler;
+import mage.client.util.MusicPlayer;
 import mage.client.util.SettingsManager;
 import mage.client.util.gui.ArrowBuilder;
-import mage.client.util.MusicPlayer;
 import mage.components.ImagePanel;
 import mage.interfaces.MageClient;
 import mage.interfaces.callback.CallbackClient;
@@ -68,32 +126,13 @@ import mage.remote.Connection.ProxyType;
 import mage.remote.Session;
 import mage.remote.SessionImpl;
 import mage.utils.MageVersion;
+import mage.view.GameEndView;
 import org.apache.log4j.Logger;
 import org.mage.card.arcane.ManaSymbols;
 import org.mage.plugins.card.constants.Constants;
 import org.mage.plugins.card.images.DownloadPictures;
 import org.mage.plugins.card.utils.impl.ImageManagerImpl;
 
-import javax.imageio.ImageIO;
-import javax.swing.*;
-import javax.swing.JToolBar.Separator;
-import javax.swing.event.PopupMenuEvent;
-import javax.swing.event.PopupMenuListener;
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.image.BufferedImage;
-import java.beans.PropertyVetoException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.prefs.Preferences;
-import mage.view.GameEndView;
 
 /**
  * @author BetaSteward_at_googlemail.com
@@ -113,7 +152,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
     private static Preferences prefs = Preferences.userNodeForPackage(MageFrame.class);
     private JLabel title;
     private Rectangle titleRectangle;
-    private static final MageVersion version = new MageVersion(1, 1, 0, "dev");
+    private static final MageVersion version = new MageVersion(1, 1, 0, "");
     private UUID clientId;
     private static MagePane activeFrame;
     private static boolean liteMode = false;

Mage.Client/src/main/java/mage/client/util/PhaseManager.java

@@ -33,9 +33,12 @@ import java.util.Map;
 import java.util.prefs.Preferences;
 import mage.client.MageFrame;
 import mage.view.GameView;
+import org.apache.log4j.Logger;
 
 public class PhaseManager {
 
+    private static final Logger logger = Logger.getLogger(PhaseManager.class);
+
     private static final PhaseManager fInstance = new PhaseManager();
 
     public static String DEFAULT_PLAYER_NAME = "player";
@@ -101,6 +104,8 @@ public class PhaseManager {
         if (prefKey != null) {
             String prop = prefs.get(prefKey, PHASE_ON);
             return !prop.equals(PHASE_ON);
+        } else {
+            logger.warn(new StringBuilder("Message not found: ").append(message));
         }
         return false;
     }

Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java

@@ -30,7 +30,7 @@ public class MultiConnectTest {
 
     private static final CountDownLatch latch = new CountDownLatch(USER_CONNECT_COUNT);
 
-    private static final MageVersion version = new MageVersion(1, 1, 0, "dev");
+    private static final MageVersion version = new MageVersion(1, 1, 0, "");
 
     private static volatile int connected;
 

Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java

@@ -34,6 +34,12 @@
 
 package mage.server.console;
 
+import java.util.UUID;
+import java.util.prefs.Preferences;
+import javax.swing.Box;
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
 import mage.interfaces.MageClient;
 import mage.interfaces.callback.ClientCallback;
 import mage.remote.Connection;
@@ -42,10 +48,6 @@ import mage.remote.SessionImpl;
 import mage.utils.MageVersion;
 import org.apache.log4j.Logger;
 
-import javax.swing.*;
-import java.util.UUID;
-import java.util.prefs.Preferences;
-
 /**
  *
  * @author BetaSteward_at_googlemail.com
@@ -57,7 +59,7 @@ public class ConsoleFrame extends javax.swing.JFrame implements MageClient {
     private static Session session;
     private ConnectDialog connectDialog;
     private static Preferences prefs = Preferences.userNodeForPackage(ConsoleFrame.class);
-    private static final MageVersion version = new MageVersion(1, 1, 0, "dev");
+    private static final MageVersion version = new MageVersion(1, 1, 0, "");
 
     /**
      * @return the session

Mage.Server/src/main/java/mage/server/Main.java

@@ -28,6 +28,13 @@
 
 package mage.server;
 
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.util.HashMap;
+import java.util.Map;
+import javax.management.MBeanServer;
 import mage.cards.repository.CardScanner;
 import mage.game.match.MatchType;
 import mage.game.tournament.TournamentType;
@@ -45,7 +52,14 @@ import mage.server.util.config.GamePlugin;
 import mage.server.util.config.Plugin;
 import mage.utils.MageVersion;
 import org.apache.log4j.Logger;
-import org.jboss.remoting.*;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.ClientDisconnectedException;
+import org.jboss.remoting.ConnectionListener;
+import org.jboss.remoting.InvocationRequest;
+import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.Remoting;
+import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.ServerInvoker;
 import org.jboss.remoting.callback.InvokerCallbackHandler;
 import org.jboss.remoting.callback.ServerInvokerCallbackHandler;
 import org.jboss.remoting.transport.Connector;
@@ -54,13 +68,6 @@ import org.jboss.remoting.transporter.TransporterClient;
 import org.jboss.remoting.transporter.TransporterServer;
 import org.w3c.dom.Element;
 
-import javax.management.MBeanServer;
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  *
@@ -73,7 +80,7 @@ public class Main {
     private static final String testModeArg = "-testMode=";
     private static final String adminPasswordArg = "-adminPassword=";
     private static final String pluginFolder = "plugins";
-    private static MageVersion version = new MageVersion(1, 1, 0, "dev");
+    private static MageVersion version = new MageVersion(1, 1, 0, "");
 
     public static PluginClassLoader classLoader = new PluginClassLoader();
     public static TransporterServer server;

Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java

@@ -1,5 +1,6 @@
 package org.mage.test.load;
 
+import java.util.UUID;
 import mage.interfaces.MageClient;
 import mage.interfaces.callback.CallbackClient;
 import mage.interfaces.callback.ClientCallback;
@@ -7,8 +8,6 @@ import mage.remote.Session;
 import mage.utils.MageVersion;
 import org.apache.log4j.Logger;
 
-import java.util.UUID;
-
 /**
  * For tests only
  *
@@ -17,7 +16,7 @@ import java.util.UUID;
 public class SimpleMageClient implements MageClient {
 
     private UUID clientId;
-    private static final MageVersion version = new MageVersion(1, 1, 0, "dev");
+    private static final MageVersion version = new MageVersion(1, 1, 0, "");
 
     private static final transient Logger log = Logger.getLogger(SimpleMageClient.class);
 

Utils/release/getting_implemented_cards.txt

@@ -13,6 +13,10 @@ git log 6b38cd5b18298b07962b969bfa2eb69c62839575..HEAD --diff-filter=A --name-st
 since 1.0.3-release:
 git log 7ba3d451da95183b8c1cfb732b332f640963cc4a..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt
 
+git log 68333a2eff6b643b2028d18dad16d1f228be7a2c..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt
+20130901
+git log 10902581140fe4268fc12408f099ad82347d7cd0..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt
+
 
 3. Copy added_cards.txt to trunk\Utils folder
 4. Run script: