[vassalengine-svn] SF.net SVN: vassalengine: [3171] VASSAL-src/branches/mkiefte-ADC2-import/ src/VASSAL/tools/imports/adc2/ADC2Module.java

[<mk...@us...>]

Revision: 3171
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=3171&view=rev
Author:   mkiefte
Date:     2008-02-29 13:14:51 -0800 (Fri, 29 Feb 2008)

Log Message:
-----------
swapped order of rotation and movement trail in imported pieces.

Modified Paths:
--------------
    VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/adc2/ADC2Module.java

Modified: VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/adc2/ADC2Module.java
===================================================================
--- VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/adc2/ADC2Module.java	2008-02-29 20:52:51 UTC (rev 3170)
+++ VASSAL-src/branches/mkiefte-ADC2-import/src/VASSAL/tools/imports/adc2/ADC2Module.java	2008-02-29 21:14:51 UTC (rev 3171)
@@ -17,6 +17,7 @@
 
 package VASSAL.tools.imports.adc2;
 
+import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.GridBagConstraints;
@@ -24,6 +25,7 @@
 import java.awt.Insets;
 import java.awt.Point;
 import java.awt.Rectangle;
+import java.awt.event.InputEvent;
 import java.awt.image.BufferedImage;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
@@ -39,6 +41,7 @@
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.KeyStroke;
 
 import VASSAL.build.GameModule;
 import VASSAL.build.module.GlobalOptions;
@@ -206,16 +209,18 @@
 				se.append("").append("").append(fileName).append(getName());
 				bp.mySetType(se.getValue());			
 
-				// common properties
-				se = new SequenceEncoder(UsePrototype.ID.replaceAll(";", ""), ';');
-				se.append(COMMON_PROPERTIES);
-				gamePiece = new UsePrototype(se.getValue(), bp);
-
 				// facing
 				if (getPieceClass().getAllowedFacings() > 1) {
 					String type = FreeRotator.ID + getPieceClass().getAllowedFacings() + ";];[;Rotate CW;Rotate CCW;;;;";
-					gamePiece = new FreeRotator(type, gamePiece);				
+					gamePiece = new FreeRotator(type, bp);				
 				}				
+				else
+					gamePiece = bp;
+
+				// common properties
+				se = new SequenceEncoder(UsePrototype.ID.replaceAll(";", ""), ';');
+				se.append(COMMON_PROPERTIES);
+				gamePiece = new UsePrototype(se.getValue(), gamePiece);
 			}
 			return gamePiece;
 		}
@@ -843,7 +848,17 @@
 		String movedIcon = "/images/moved.gif";
 		se.append(movedIcon).append(xOffset).append(yOffset);
 		gp = new MovementMarkable(MovementMarkable.ID + se.getValue(), gp);
-		gp = new Footprint(Footprint.ID, gp);
+		se = new SequenceEncoder(';');
+		se.append(KeyStroke.getKeyStroke('T', InputEvent.CTRL_MASK))
+			.append("Movement Trail")
+			.append(false)
+			.append(false)
+			.append(10)
+			.append(Color.WHITE)
+			.append(Color.BLACK)
+			.append(100)
+			.append(0);
+		gp = new Footprint(Footprint.ID + se.getValue(), gp);
 		
 		def.setPiece(gp);		
 	}


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