[vassalengine-svn] SF.net SVN: vassalengine: [2928] VASSAL-src/branches/mkiefte-ADC2-import

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 2928
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=2928&view=rev
Author:   mkiefte
Date:     2008-01-30 08:19:36 -0800 (Wed, 30 Jan 2008)

Log Message:
-----------
Changed \'foreign\' to \'imports\' and merged up to r2923

Modified Paths:
--------------
    VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/launch/ConsoleControls.java
    VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/adc2/ADC2Module.java
    VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/adc2/ImportADC2Action.java
    VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/adc2/MapBoard.java
    VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/adc2/SymbolSet.java

Added Paths:
-----------
    VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/
    VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/FileExtensionFilter.java
    VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/FileFormatException.java
    VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/adc2/
    VASSAL-src/branches/mkiefte-ADC2-import/src/help/
    VASSAL-src/branches/mkiefte-ADC2-import/src/help/Intro.html
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/DoorClose.au
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/DoorOpen.au
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/Edit16.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/Help16.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/Save16.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/SaveAs16.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/Splash.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/Splash.png
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/StepForward16.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/Undo16.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/camera.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/chart.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/connect.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/counter.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/die.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/disconnect.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/getMessages.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/globe_selected.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/globe_unselected.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/inventory.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/keyCommand.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/lockedRoom.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/map.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/moved.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/notes.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/overview.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/phone1.wav
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/playerAway.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/playerLooking.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/postMessage.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/recenter.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/roller.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/status.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/thread.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/unmoved.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/zoom.png
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/zoomIn.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/zoomIn.png
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/zoomOut.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/zoomOut.png

Removed Paths:
-------------
    VASSAL-src/branches/mkiefte-ADC2-import/help/
    VASSAL-src/branches/mkiefte-ADC2-import/images/
    VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/foreign/
    VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/adc2/
    VASSAL-src/branches/mkiefte-ADC2-import/src/help/Intro.html
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/DoorClose.au
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/DoorOpen.au
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/Edit16.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/Help16.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/Save16.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/SaveAs16.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/Splash.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/Splash.png
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/StepForward16.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/Undo16.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/camera.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/chart.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/connect.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/counter.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/die.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/disconnect.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/getMessages.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/globe_selected.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/globe_unselected.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/inventory.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/keyCommand.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/lockedRoom.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/map.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/moved.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/notes.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/overview.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/phone1.wav
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/playerAway.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/playerLooking.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/postMessage.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/recenter.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/roller.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/status.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/thread.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/unmoved.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/zoom.png
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/zoomIn.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/zoomIn.png
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/zoomOut.gif
    VASSAL-src/branches/mkiefte-ADC2-import/src/images/zoomOut.png

Modified: VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/launch/ConsoleControls.java
===================================================================

--- VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/launch/ConsoleControls.java	2008-01-30 06:35:31 UTC (rev 2927)
+++ VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/launch/ConsoleControls.java	2008-01-30 16:19:36 UTC (rev 2928)
@@ -40,7 +40,7 @@
 import VASSAL.i18n.Resources;
 import VASSAL.preferences.Prefs;
 import VASSAL.tools.FileChooser;
-import VASSAL.tools.foreign.adc2.ImportADC2Action;
+import VASSAL.tools.imports.adc2.ImportADC2Action;
 
 /**
  * The starting controls from which the user may load or edit any module

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports (from rev 2921, VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/foreign)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/FileExtensionFilter.java (from rev 2927, VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/foreign/FileExtensionFilter.java)
===================================================================
--- VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/FileExtensionFilter.java	                        (rev 0)
+++ VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/FileExtensionFilter.java	2008-01-30 16:19:36 UTC (rev 2928)
@@ -0,0 +1,37 @@
+package VASSAL.tools.imports;
+
+import java.io.File;
+
+import VASSAL.tools.FileFilter;
+import VASSAL.tools.imports.adc2.ImportADC2Action;
+
+/**
+ * A simple file filter that does a case-insensitive match against a file name
+ * extension.
+ */
+public class FileExtensionFilter extends FileFilter {
+	private final String extension;
+	private final String description;
+	
+	/**
+	 * @param extension   file extension
+	 * @param description a brief description (<it>e.g.</it>, <tt>"Bitmaps"</tt>).
+	 */
+	public FileExtensionFilter(String extension, String description) {
+		this.extension = extension;
+		this.description = description;
+	}
+	
+	public boolean accept(File f) {
+		if (f.isDirectory())
+			return true;
+		if (ImportADC2Action.getExtension(f.getName()).equalsIgnoreCase(extension))
+			return true;
+		else
+			return false;
+	}
+
+	public String getDescription() {
+		return description + " (*." + extension.toLowerCase() + ";*." + extension.toUpperCase() + ')';
+	}
+}
\ No newline at end of file

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/FileFormatException.java (from rev 2927, VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/foreign/FileFormatException.java)
===================================================================
--- VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/FileFormatException.java	                        (rev 0)
+++ VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/FileFormatException.java	2008-01-30 16:19:36 UTC (rev 2928)
@@ -0,0 +1,19 @@
+package VASSAL.tools.imports;
+
+import java.io.IOException;
+
+/**
+ * File cannot be interpreted.  Either the file is not what VASSAL thinks it is
+ * or it is currupted in some way.
+ */
+public class FileFormatException extends IOException {
+
+	private static final long serialVersionUID = 0L;
+
+	FileFormatException() {
+	}
+
+	public FileFormatException(String s) {
+		super(s);
+	}
+}
\ No newline at end of file

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/adc2 (from rev 2927, VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/foreign/adc2)

Modified: VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/adc2/ADC2Module.java
===================================================================
--- VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/foreign/adc2/ADC2Module.java	2008-01-30 06:35:31 UTC (rev 2927)
+++ VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/adc2/ADC2Module.java	2008-01-30 16:19:36 UTC (rev 2928)
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package VASSAL.tools.foreign.adc2;
+package VASSAL.tools.imports.adc2;
 
 import java.awt.Dimension;
 import java.awt.Graphics2D;
@@ -54,7 +54,7 @@
 import VASSAL.counters.ReturnToDeck;
 import VASSAL.counters.UsePrototype;
 import VASSAL.tools.SequenceEncoder;
-import VASSAL.tools.foreign.FileFormatException;
+import VASSAL.tools.imports.FileFormatException;
 
 class ADC2Module {
 	

Modified: VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/adc2/ImportADC2Action.java
===================================================================
--- VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/foreign/adc2/ImportADC2Action.java	2008-01-30 06:35:31 UTC (rev 2927)
+++ VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/adc2/ImportADC2Action.java	2008-01-30 16:19:36 UTC (rev 2928)
@@ -28,7 +28,7 @@
  * - bezier smoothing of hexlines in hexes with no intersections
  */
 
-package VASSAL.tools.foreign.adc2;
+package VASSAL.tools.imports.adc2;
 
 import java.awt.Component;
 import java.awt.event.ActionEvent;
@@ -48,11 +48,11 @@
 import VASSAL.tools.DataArchive;
 import VASSAL.tools.FileChooser;
 import VASSAL.tools.FileFilter;
-import VASSAL.tools.foreign.FileExtensionFilter;
-import VASSAL.tools.foreign.FileFormatException;
+import VASSAL.tools.imports.FileExtensionFilter;
+import VASSAL.tools.imports.FileFormatException;
 
 /**
- * Import a foreign module to VASSAL.
+ * Import a imports module to VASSAL.
  * 
  * @author Michael Kiefte
  *

Modified: VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/adc2/MapBoard.java
===================================================================
--- VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/foreign/adc2/MapBoard.java	2008-01-30 06:35:31 UTC (rev 2927)
+++ VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/adc2/MapBoard.java	2008-01-30 16:19:36 UTC (rev 2928)
@@ -1,4 +1,4 @@
-package VASSAL.tools.foreign.adc2;
+package VASSAL.tools.imports.adc2;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
@@ -42,7 +42,7 @@
 import VASSAL.build.module.map.boardPicker.board.mapgrid.RegularGridNumbering;
 import VASSAL.build.module.map.boardPicker.board.mapgrid.SquareGridNumbering;
 import VASSAL.build.module.map.boardPicker.board.mapgrid.Zone;
-import VASSAL.tools.foreign.FileFormatException;
+import VASSAL.tools.imports.FileFormatException;
 
 /**
  * The map board itself.

Modified: VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/adc2/SymbolSet.java
===================================================================
--- VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/foreign/adc2/SymbolSet.java	2008-01-30 06:35:31 UTC (rev 2927)
+++ VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/adc2/SymbolSet.java	2008-01-30 16:19:36 UTC (rev 2928)
@@ -1,4 +1,4 @@
-package VASSAL.tools.foreign.adc2;
+package VASSAL.tools.imports.adc2;
 
 import java.awt.AlphaComposite;
 import java.awt.Dimension;
@@ -17,7 +17,7 @@
 import javax.imageio.ImageIO;
 
 import VASSAL.build.GameModule;
-import VASSAL.tools.foreign.FileFormatException;
+import VASSAL.tools.imports.FileFormatException;
 
 /**
  * Game piece and terrain symbols.

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/help (from rev 2923, VASSAL-src/trunk/src/help)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/help/Intro.html
===================================================================
--- VASSAL-src/trunk/src/help/Intro.html	2008-01-30 04:48:14 UTC (rev 2923)
+++ VASSAL-src/branches/mkiefte-ADC2-import/src/help/Intro.html	2008-01-30 16:19:36 UTC (rev 2928)
@@ -1,91 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta http-equiv="content-type"
- content="text/html; charset=ISO-8859-1">
-  <title>VASSAL Quick-Start</title>
-</head>
-<body>
-<div style="text-align: center;">
-<h1>VASSAL Quick-Start Guide<br>
-</h1>
-</div>
-More details can be found in the User's Guide.<br>
-<br>
-<h3>Starting a Game<br>
-</h3>
-Select File-&gt;New Game to begin a new game.&nbsp; You may be prompted
-to choose a side or select boards.&nbsp; At any point, select
-File-&gt;Save Game to save a snapshot of the current game to a
-file.&nbsp; The game may resotred by selecting File-&gt;Load Game.<br>
-<h3> Moving Pieces<br>
-</h3>
-Pieces are moved by clicking and dragging with the mouse.&nbsp; To
-place pieces initially, use the buttons on the main window toolbar to
-show the game piece palette and drag pieces onto the map. Pieces stack
-if you move them onto one another, and clicking and dragging will move
-the entire stack.&nbsp; Double-click on a stack to expand it.&nbsp;
-Click on a piece and use the arrow keys to change the position of a
-piece within a stack.  When a stack is expanded, you can drag
-individual pieces into or out of it, or you can shift-click to select
-multiple units, then click on one of them and drag to move them all at
-once.<br>
-<br>
-The map scrolls when you drag the mouse near the edges.  Also, you can
-use the number pad keys (you may need to hit the Num Lock key first).<br>
-<h3>Modifying Pieces</h3>
-Right-click (Mac: command-click) on a counter for a drop-down menu of
-commands.  Each command has a keyboard shortcut. To use the keyboard
-shortcut, click on a game piece (it will become highlighted), then type in the keyboard shortcut for the command.<br>
-<br>
-<h2 style="text-align: center;"> Playing over a live connection<br>
-</h2>
-<h3>Connecting</h3>
-Hit the "Server" button (with the two arrows) in the main window
-toolbar to reveal the server controls, which will appear in a docked
-panel to the right.  Within that panel, hit the "Connect" button (again with two arrows)
-to connect.  You'll see a welcome message in the controls window when
-connection is complete.  A list of active game rooms appears on the
-left.  The "Main Room" one is a meeting room for talking with other
-players. <br>
-<h3>Chatting</h3>
-In the center of the main window is an area for displaying text
-messages and, immediately below it, an area for typing your own
-messages.&nbsp; Hit return to send the message.&nbsp; Any text you type
-into a map window is echoed to the chat text entry area as well.&nbsp;
-Your chat messages will be sent to all other players in the same room
-on the server.  You may also open a private channel to another player
-via the popup menu by right-clicking on the player's name.<br>
-<br>
-<h3>Beginning a game</h3>
-To begin a game, type the name of a new room into the field above the
-list of active game rooms.  The new room will be created and you will
-join it.  To join an existing game room, double click on the room name
-in the list.  You'll see a list of players currently connected to the
-room you're in.  The first person to join the room should begin a game
-as described above.  After joining the room, other players should
-right-click on the name of any player already in the room and select
-"Synchronize."  A game map will appear automatically with the same
-information as on the other player's screen.  From that point on, any
-pieces moved by any of the players in the room will automatically be
-echoed on all the other players' screens.<br>
-<br>
-<h3>Messages </h3>
-The server maintains a message board for players to find opponents,
-arrange game, etc.  Use the Server&nbsp; toolbar buttons to post and
-read message. <br>
-<h2 style="text-align: center;">Playing by Email<br>
-</h2>
-You can use VASSAL to play games by email as well.  Start a new game,
-place your pieces, then select File-&gt;Begin Logfile.  All moves and
-chat text will be recorded in the logfile.  When finished, select
-File-&gt;End Logfile and email the resulting file to your opponent. 
-Your opponent then selects File-&gt;Load Game and chooses the logfile
-you sent him by email.  He may then step through your move one at a
-time by hitting the Step button, interrupting whenever appropriate to
-create his own logfile to send back to you.  When reading and writing a
-logfile simultaneously, the moves read in from your opponent's logfile
-are echoed and recorded into the one you are writing.<br>
-<br>
-</body>
-</html>

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/help/Intro.html (from rev 2923, VASSAL-src/trunk/src/help/Intro.html)
===================================================================
--- VASSAL-src/branches/mkiefte-ADC2-import/src/help/Intro.html	                        (rev 0)
+++ VASSAL-src/branches/mkiefte-ADC2-import/src/help/Intro.html	2008-01-30 16:19:36 UTC (rev 2928)
@@ -0,0 +1,91 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta http-equiv="content-type"
+ content="text/html; charset=ISO-8859-1">
+  <title>VASSAL Quick-Start</title>
+</head>
+<body>
+<div style="text-align: center;">
+<h1>VASSAL Quick-Start Guide<br>
+</h1>
+</div>
+More details can be found in the User's Guide.<br>
+<br>
+<h3>Starting a Game<br>
+</h3>
+Select File-&gt;New Game to begin a new game.&nbsp; You may be prompted
+to choose a side or select boards.&nbsp; At any point, select
+File-&gt;Save Game to save a snapshot of the current game to a
+file.&nbsp; The game may resotred by selecting File-&gt;Load Game.<br>
+<h3> Moving Pieces<br>
+</h3>
+Pieces are moved by clicking and dragging with the mouse.&nbsp; To
+place pieces initially, use the buttons on the main window toolbar to
+show the game piece palette and drag pieces onto the map. Pieces stack
+if you move them onto one another, and clicking and dragging will move
+the entire stack.&nbsp; Double-click on a stack to expand it.&nbsp;
+Click on a piece and use the arrow keys to change the position of a
+piece within a stack.  When a stack is expanded, you can drag
+individual pieces into or out of it, or you can shift-click to select
+multiple units, then click on one of them and drag to move them all at
+once.<br>
+<br>
+The map scrolls when you drag the mouse near the edges.  Also, you can
+use the number pad keys (you may need to hit the Num Lock key first).<br>
+<h3>Modifying Pieces</h3>
+Right-click (Mac: command-click) on a counter for a drop-down menu of
+commands.  Each command has a keyboard shortcut. To use the keyboard
+shortcut, click on a game piece (it will become highlighted), then type in the keyboard shortcut for the command.<br>
+<br>
+<h2 style="text-align: center;"> Playing over a live connection<br>
+</h2>
+<h3>Connecting</h3>
+Hit the "Server" button (with the two arrows) in the main window
+toolbar to reveal the server controls, which will appear in a docked
+panel to the right.  Within that panel, hit the "Connect" button (again with two arrows)
+to connect.  You'll see a welcome message in the controls window when
+connection is complete.  A list of active game rooms appears on the
+left.  The "Main Room" one is a meeting room for talking with other
+players. <br>
+<h3>Chatting</h3>
+In the center of the main window is an area for displaying text
+messages and, immediately below it, an area for typing your own
+messages.&nbsp; Hit return to send the message.&nbsp; Any text you type
+into a map window is echoed to the chat text entry area as well.&nbsp;
+Your chat messages will be sent to all other players in the same room
+on the server.  You may also open a private channel to another player
+via the popup menu by right-clicking on the player's name.<br>
+<br>
+<h3>Beginning a game</h3>
+To begin a game, type the name of a new room into the field above the
+list of active game rooms.  The new room will be created and you will
+join it.  To join an existing game room, double click on the room name
+in the list.  You'll see a list of players currently connected to the
+room you're in.  The first person to join the room should begin a game
+as described above.  After joining the room, other players should
+right-click on the name of any player already in the room and select
+"Synchronize."  A game map will appear automatically with the same
+information as on the other player's screen.  From that point on, any
+pieces moved by any of the players in the room will automatically be
+echoed on all the other players' screens.<br>
+<br>
+<h3>Messages </h3>
+The server maintains a message board for players to find opponents,
+arrange game, etc.  Use the Server&nbsp; toolbar buttons to post and
+read message. <br>
+<h2 style="text-align: center;">Playing by Email<br>
+</h2>
+You can use VASSAL to play games by email as well.  Start a new game,
+place your pieces, then select File-&gt;Begin Logfile.  All moves and
+chat text will be recorded in the logfile.  When finished, select
+File-&gt;End Logfile and email the resulting file to your opponent. 
+Your opponent then selects File-&gt;Load Game and chooses the logfile
+you sent him by email.  He may then step through your move one at a
+time by hitting the Step button, interrupting whenever appropriate to
+create his own logfile to send back to you.  When reading and writing a
+logfile simultaneously, the moves read in from your opponent's logfile
+are echoed and recorded into the one you are writing.<br>
+<br>
+</body>
+</html>

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images (from rev 2923, VASSAL-src/trunk/src/images)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/DoorClose.au
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/DoorClose.au (from rev 2923, VASSAL-src/trunk/src/images/DoorClose.au)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/DoorOpen.au
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/DoorOpen.au (from rev 2923, VASSAL-src/trunk/src/images/DoorOpen.au)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/Edit16.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/Edit16.gif (from rev 2923, VASSAL-src/trunk/src/images/Edit16.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/Help16.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/Help16.gif (from rev 2923, VASSAL-src/trunk/src/images/Help16.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/Save16.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/Save16.gif (from rev 2923, VASSAL-src/trunk/src/images/Save16.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/SaveAs16.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/SaveAs16.gif (from rev 2923, VASSAL-src/trunk/src/images/SaveAs16.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/Splash.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/Splash.gif (from rev 2923, VASSAL-src/trunk/src/images/Splash.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/Splash.png
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/Splash.png (from rev 2923, VASSAL-src/trunk/src/images/Splash.png)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/StepForward16.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/StepForward16.gif (from rev 2923, VASSAL-src/trunk/src/images/StepForward16.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/Undo16.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/Undo16.gif (from rev 2923, VASSAL-src/trunk/src/images/Undo16.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/camera.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/camera.gif (from rev 2923, VASSAL-src/trunk/src/images/camera.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/chart.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/chart.gif (from rev 2923, VASSAL-src/trunk/src/images/chart.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/connect.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/connect.gif (from rev 2923, VASSAL-src/trunk/src/images/connect.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/counter.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/counter.gif (from rev 2923, VASSAL-src/trunk/src/images/counter.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/die.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/die.gif (from rev 2923, VASSAL-src/trunk/src/images/die.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/disconnect.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/disconnect.gif (from rev 2923, VASSAL-src/trunk/src/images/disconnect.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/getMessages.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/getMessages.gif (from rev 2923, VASSAL-src/trunk/src/images/getMessages.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/globe_selected.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/globe_selected.gif (from rev 2923, VASSAL-src/trunk/src/images/globe_selected.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/globe_unselected.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/globe_unselected.gif (from rev 2923, VASSAL-src/trunk/src/images/globe_unselected.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/inventory.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/inventory.gif (from rev 2923, VASSAL-src/trunk/src/images/inventory.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/keyCommand.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/keyCommand.gif (from rev 2923, VASSAL-src/trunk/src/images/keyCommand.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/lockedRoom.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/lockedRoom.gif (from rev 2923, VASSAL-src/trunk/src/images/lockedRoom.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/map.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/map.gif (from rev 2923, VASSAL-src/trunk/src/images/map.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/moved.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/moved.gif (from rev 2923, VASSAL-src/trunk/src/images/moved.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/notes.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/notes.gif (from rev 2923, VASSAL-src/trunk/src/images/notes.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/overview.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/overview.gif (from rev 2923, VASSAL-src/trunk/src/images/overview.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/phone1.wav
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/phone1.wav (from rev 2923, VASSAL-src/trunk/src/images/phone1.wav)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/playerAway.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/playerAway.gif (from rev 2923, VASSAL-src/trunk/src/images/playerAway.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/playerLooking.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/playerLooking.gif (from rev 2923, VASSAL-src/trunk/src/images/playerLooking.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/postMessage.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/postMessage.gif (from rev 2923, VASSAL-src/trunk/src/images/postMessage.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/recenter.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/recenter.gif (from rev 2923, VASSAL-src/trunk/src/images/recenter.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/roller.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/roller.gif (from rev 2923, VASSAL-src/trunk/src/images/roller.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/status.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/status.gif (from rev 2923, VASSAL-src/trunk/src/images/status.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/thread.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/thread.gif (from rev 2923, VASSAL-src/trunk/src/images/thread.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/unmoved.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/unmoved.gif (from rev 2923, VASSAL-src/trunk/src/images/unmoved.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/zoom.png
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/zoom.png (from rev 2923, VASSAL-src/trunk/src/images/zoom.png)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/zoomIn.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/zoomIn.gif (from rev 2923, VASSAL-src/trunk/src/images/zoomIn.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/zoomIn.png
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/zoomIn.png (from rev 2923, VASSAL-src/trunk/src/images/zoomIn.png)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/zoomOut.gif
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/zoomOut.gif (from rev 2923, VASSAL-src/trunk/src/images/zoomOut.gif)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/branches/mkiefte-ADC2-import/src/images/zoomOut.png
===================================================================
(Binary files differ)

Copied: VASSAL-src/branches/mkiefte-ADC2-import/src/images/zoomOut.png (from rev 2923, VASSAL-src/trunk/src/images/zoomOut.png)
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


