[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine:[5078] VSQL-src/trunk
Brought to you by:
rodneykinney,
uckelman
From: <swa...@us...> - 2009-02-09 05:40:58
|
Revision: 5078 http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5078&view=rev Author: swampwallaby Date: 2009-02-09 05:40:45 +0000 (Mon, 09 Feb 2009) Log Message: ----------- VSQL Code updated for 3.0/3.1 VAssal compatibility Modified Paths: -------------- VSQL-src/trunk/.classpath VSQL-src/trunk/Acme/IntHashtable.java VSQL-src/trunk/Acme/JPM/Encoders/GifEncoder.java VSQL-src/trunk/Acme/JPM/Encoders/ImageEncoder.java VSQL-src/trunk/AutoImage/Item.java VSQL-src/trunk/AutoImage/NewColorConfigurer.java VSQL-src/trunk/AutoImage/StringEnumConfigurer.java VSQL-src/trunk/AutoImage/Symbol.java VSQL-src/trunk/BattleTech/BattlefieldLoader.java VSQL-src/trunk/BattleTech/MessageBox.java VSQL-src/trunk/BattleTech/MyImagePicker.java VSQL-src/trunk/BattleTech/ViewInfo.java VSQL-src/trunk/CASL/GameBuilder/CounterInfoFrame.java VSQL-src/trunk/CASL/GameBuilder/GameEditFrame_AboutBox.java VSQL-src/trunk/CASL/GameBuilder/NewScenarioDialog.java VSQL-src/trunk/CASL/GameBuilder/ScenarioSetupAreaDialog.java VSQL-src/trunk/CASL/Map/Bridge.java VSQL-src/trunk/CASL/Map/Hex.java VSQL-src/trunk/CASL/Map/LOSResult.java VSQL-src/trunk/CASL/Map/Location.java VSQL-src/trunk/CASL/Map/MovementLogic.java VSQL-src/trunk/CASL/Map/PrefabBuilding.java VSQL-src/trunk/CASL/Map/Smoke.java VSQL-src/trunk/CASL/Map/Terrain.java VSQL-src/trunk/CASL/MapBuilder/BridgeSelection.java VSQL-src/trunk/CASL/MapBuilder/CustomBridgeDialog.java VSQL-src/trunk/CASL/MapBuilder/CustomBuildingDialog.java VSQL-src/trunk/CASL/MapBuilder/HexSelection.java VSQL-src/trunk/CASL/MapBuilder/HexsideSelection.java VSQL-src/trunk/CASL/MapBuilder/InsertMapDialog.java VSQL-src/trunk/CASL/MapBuilder/MapBuilder.java VSQL-src/trunk/CASL/MapBuilder/MapEditFrameBeanInfo.java VSQL-src/trunk/CASL/MapBuilder/MapEditFrame_AboutBox.java VSQL-src/trunk/CASL/MapBuilder/MapEditor.java VSQL-src/trunk/CASL/MapBuilder/MessageFrame.java VSQL-src/trunk/CASL/MapBuilder/NewMapDialog.java VSQL-src/trunk/CASL/MapBuilder/PopupMenuAction.java VSQL-src/trunk/CASL/MapBuilder/PrefabBuildingDialog.java VSQL-src/trunk/CASL/MapBuilder/RectangularSelection.java VSQL-src/trunk/CASL/MapBuilder/Selection.java VSQL-src/trunk/CASL/MapBuilder/Utility/AskYesNoDialog.java VSQL-src/trunk/CASL/MapBuilder/Utility/CASLProperties.java VSQL-src/trunk/CASL/MapBuilder/Utility/chooseFileDialog.java VSQL-src/trunk/CASL/MapBuilder/VASLColorMap.java VSQL-src/trunk/CASL/MapBuilder/VASLMapConverter.java VSQL-src/trunk/CASL/MapBuilder/VASLMapConverterDialog.java VSQL-src/trunk/CASL/Scenario/Game.java VSQL-src/trunk/CASL/Unit/CounterPopupMenuAction.java VSQL-src/trunk/CASL/Unit/Stack.java VSQL-src/trunk/CASL/Unit/UnitPopupMenuAction.java VSQL-src/trunk/Dev/ExpressionEvaluator.java VSQL-src/trunk/GameTimer/GameTimer.java VSQL-src/trunk/Inventory/InvCommandEncoder.java VSQL-src/trunk/PB/PBConcealable.java VSQL-src/trunk/PB/PBConcealment.java VSQL-src/trunk/PB/PBMassKeyMenu.java VSQL-src/trunk/PB/PBNotesWindow.java VSQL-src/trunk/TRC/TrcInventory.java VSQL-src/trunk/ThirdReich/HexGridNumbering.java VSQL-src/trunk/ThirdReich/ObliqueHexGridNumbering.java VSQL-src/trunk/ThirdReich/TREmbellishment.java VSQL-src/trunk/UpFront/Messenger.java VSQL-src/trunk/UpFront/StringArrayConfigurer.java VSQL-src/trunk/VASL/build/module/ScenInfo.java VSQL-src/trunk/VASL/build/module/map/ASLPieceMover.java VSQL-src/trunk/VASL/build/module/map/BoardVersionChecker.java VSQL-src/trunk/VASL/build/module/map/HindranceKeeper.java VSQL-src/trunk/VASL/build/module/map/MassRemover.java VSQL-src/trunk/VASL/build/module/map/PieceMover.java VSQL-src/trunk/VASL/build/module/map/boardPicker/ASLBoard.java VSQL-src/trunk/VASL/build/module/map/boardPicker/ASLBoardSlot.java VSQL-src/trunk/VASL/build/module/map/boardPicker/SSROverlay.java VSQL-src/trunk/VASL/build/module/map/boardPicker/board/ASLHexGrid.java VSQL-src/trunk/VASL/counters/ASLHighlighter.java VSQL-src/trunk/VASL/counters/ColoredBox.java VSQL-src/trunk/VASL/counters/Concealment.java VSQL-src/trunk/VASL/counters/MarkMoved.java VSQL-src/trunk/VASL/counters/PlaceDM.java VSQL-src/trunk/VASL/counters/TextInfo.java VSQL-src/trunk/VSQL/VSQLConcealable.java VSQL-src/trunk/VSQL/VSQLListWidget.java VSQL-src/trunk/VSQL/VSQLMarkMoved.java VSQL-src/trunk/VSQL/VSQLTurreted.java VSQL-src/trunk/afk/HexGridNumbering.java VSQL-src/trunk/cc/CCInfo.java VSQL-src/trunk/cc/CCResetSquad.java VSQL-src/trunk/cc/PieceMover.java VSQL-src/trunk/ij/process/MedianCut.java VSQL-src/trunk/iw/CounterDetailViewer.java VSQL-src/trunk/jep/BasicPieceFunction.java VSQL-src/trunk/jep/Expression.java VSQL-src/trunk/jep/ExpressionEvaluator.java VSQL-src/trunk/jep/Random.java VSQL-src/trunk/jep/SumStack.java VSQL-src/trunk/samlords/NewZone.java VSQL-src/trunk/script/ExpressionConfigurer.java VSQL-src/trunk/terrain/TerrainDefinitions.java VSQL-src/trunk/turn/TurnTracker.java VSQL-src/trunk/wga/BasicMassKeyCommand.java VSQL-src/trunk/wga/CounterGlobalKeyCommand.java VSQL-src/trunk/wga/MassKeyCommand.java Added Paths: ----------- VSQL-src/trunk/RSG/ VSQL-src/trunk/RSG/RSG.java VSQL-src/trunk/sop/ VSQL-src/trunk/sop/SopInventory.java Removed Paths: ------------- VSQL-src/trunk/ModuleConf/ VSQL-src/trunk/script/DoActionButton.java VSQL-src/trunk/test/ Modified: VSQL-src/trunk/.classpath =================================================================== --- VSQL-src/trunk/.classpath 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/.classpath 2009-02-09 05:40:45 UTC (rev 5078) @@ -3,8 +3,7 @@ <classpathentry kind="src" path=""/> <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/BeanShell"/> - <classpathentry kind="lib" path="/Vassal-3.0.17/lib/wizard.jar"/> - <classpathentry kind="lib" path="/Vassal-work/lib/swing-worker-1.2.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/Vassal-work4"/> + <classpathentry combineaccessrules="false" kind="src" path="/Vassal-3.1"/> + <classpathentry kind="lib" path="/Vassal-3.1/lib/swing-worker-1.2.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: VSQL-src/trunk/Acme/IntHashtable.java =================================================================== --- VSQL-src/trunk/Acme/IntHashtable.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/Acme/IntHashtable.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -7,7 +7,9 @@ package Acme; -import java.util.*; +import java.util.Dictionary; +import java.util.Enumeration; +import java.util.NoSuchElementException; /// A Hashtable that uses ints as the keys. // <P> Modified: VSQL-src/trunk/Acme/JPM/Encoders/GifEncoder.java =================================================================== --- VSQL-src/trunk/Acme/JPM/Encoders/GifEncoder.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/Acme/JPM/Encoders/GifEncoder.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -30,10 +30,11 @@ package Acme.JPM.Encoders; -import java.util.*; -import java.io.*; import java.awt.Image; -import java.awt.image.*; +import java.awt.image.ImageProducer; +import java.io.IOException; +import java.io.OutputStream; +import java.util.Enumeration; /// Write out an image as a GIF. // <P> Modified: VSQL-src/trunk/Acme/JPM/Encoders/ImageEncoder.java =================================================================== --- VSQL-src/trunk/Acme/JPM/Encoders/ImageEncoder.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/Acme/JPM/Encoders/ImageEncoder.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -28,10 +28,13 @@ package Acme.JPM.Encoders; -import java.util.*; -import java.io.*; import java.awt.Image; -import java.awt.image.*; +import java.awt.image.ColorModel; +import java.awt.image.ImageConsumer; +import java.awt.image.ImageProducer; +import java.io.IOException; +import java.io.OutputStream; +import java.util.Hashtable; /// Abstract class for writing out an image. // <P> Modified: VSQL-src/trunk/AutoImage/Item.java =================================================================== --- VSQL-src/trunk/AutoImage/Item.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/AutoImage/Item.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -19,9 +19,7 @@ package AutoImage; import java.awt.Graphics; -import java.awt.Graphics2D; import java.awt.Point; -import java.awt.RenderingHints; import VASSAL.build.AbstractConfigurable; import VASSAL.build.AutoConfigurable; Modified: VSQL-src/trunk/AutoImage/NewColorConfigurer.java =================================================================== --- VSQL-src/trunk/AutoImage/NewColorConfigurer.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/AutoImage/NewColorConfigurer.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -22,7 +22,13 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import javax.swing.*; +import javax.swing.Box; +import javax.swing.BoxLayout; +import javax.swing.JButton; +import javax.swing.JColorChooser; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.SwingUtilities; import VASSAL.configure.BooleanConfigurer; import VASSAL.configure.Configurer; Modified: VSQL-src/trunk/AutoImage/StringEnumConfigurer.java =================================================================== --- VSQL-src/trunk/AutoImage/StringEnumConfigurer.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/AutoImage/StringEnumConfigurer.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -26,16 +26,20 @@ */ package AutoImage; -import javax.swing.*; +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import javax.swing.Box; +import javax.swing.DefaultComboBoxModel; +import javax.swing.JComboBox; +import javax.swing.JFrame; +import javax.swing.JLabel; + import VASSAL.configure.Configurer; -import java.awt.*; -import java.awt.event.ActionListener; -import java.awt.event.ActionEvent; -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeEvent; - /** * A Configurer that returns a String from among a list of possible values */ Modified: VSQL-src/trunk/AutoImage/Symbol.java =================================================================== --- VSQL-src/trunk/AutoImage/Symbol.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/AutoImage/Symbol.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -24,7 +24,6 @@ import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Rectangle; -import java.awt.RenderingHints; import java.awt.geom.Arc2D; import java.awt.geom.GeneralPath; import java.awt.image.BufferedImage; Modified: VSQL-src/trunk/BattleTech/BattlefieldLoader.java =================================================================== --- VSQL-src/trunk/BattleTech/BattlefieldLoader.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/BattleTech/BattlefieldLoader.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -1,22 +1,23 @@ package BattleTech; +import java.awt.Container; +import java.awt.FlowLayout; +import java.awt.Image; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.Enumeration; + +import javax.swing.JButton; +import javax.swing.JDialog; + import VASSAL.build.AbstractConfigurable; import VASSAL.build.Buildable; import VASSAL.build.GameModule; import VASSAL.build.module.GameComponent; import VASSAL.build.module.Map; import VASSAL.command.Command; -import VASSAL.command.*; +import VASSAL.command.CommandEncoder; -import javax.swing.*; - -import java.awt.*; -import java.util.*; -import java.awt.event.*; - -import BattleTech.MyImagePicker; -import BattleTech.BattleTechBoard; - public class BattlefieldLoader extends AbstractConfigurable implements CommandEncoder, GameComponent { private JButton importButton; // Adds an increment to the tension counter Modified: VSQL-src/trunk/BattleTech/MessageBox.java =================================================================== --- VSQL-src/trunk/BattleTech/MessageBox.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/BattleTech/MessageBox.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -1,6 +1,25 @@ package BattleTech; -import java.awt.*; -import java.awt.event.*; +import java.awt.BorderLayout; +import java.awt.Button; +import java.awt.Canvas; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dialog; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.Label; +import java.awt.Panel; +import java.awt.Toolkit; +import java.awt.Window; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.awt.event.WindowEvent; +import java.awt.event.WindowListener; /** * Provides a reusable window that presents a message and Modified: VSQL-src/trunk/BattleTech/MyImagePicker.java =================================================================== --- VSQL-src/trunk/BattleTech/MyImagePicker.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/BattleTech/MyImagePicker.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -18,21 +18,24 @@ */ package BattleTech; -import VASSAL.build.GameModule; -import VASSAL.build.module.Map; - -import javax.swing.*; -import javax.swing.filechooser.*; -import javax.imageio.ImageIO; - -import java.awt.*; +import java.awt.Font; +import java.awt.Image; +import java.awt.Toolkit; +import java.awt.Window; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; -import BattleTech.MessageBox; +import javax.swing.BoxLayout; +import javax.swing.ImageIcon; +import javax.swing.JComboBox; +import javax.swing.JLabel; +import javax.swing.JTextArea; +import javax.swing.SwingUtilities; +import VASSAL.build.module.Map; + public class MyImagePicker extends javax.swing.JPanel implements MouseListener, ItemListener { private String imageName = " "; private String imagePath = ""; Modified: VSQL-src/trunk/BattleTech/ViewInfo.java =================================================================== --- VSQL-src/trunk/BattleTech/ViewInfo.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/BattleTech/ViewInfo.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -1,21 +1,54 @@ package BattleTech; -import java.awt.*; -import java.awt.event.*; - +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Frame; +import java.awt.Graphics; +import java.awt.Image; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.Shape; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; import java.io.IOException; -import javax.swing.event.*; -import javax.swing.*; +import javax.swing.BorderFactory; +import javax.swing.BoxLayout; +import javax.swing.ImageIcon; +import javax.swing.JDialog; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.JSpinner; +import javax.swing.JSplitPane; +import javax.swing.JTextField; +import javax.swing.KeyStroke; +import javax.swing.SpinnerListModel; +import javax.swing.SpinnerModel; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; import VASSAL.build.GameModule; -import VASSAL.command.*; -import VASSAL.configure.*; -import VASSAL.counters.*; -import VASSAL.tools.*; +import VASSAL.command.ChangeTracker; +import VASSAL.command.Command; +import VASSAL.configure.HotKeyConfigurer; +import VASSAL.configure.StringConfigurer; +import VASSAL.counters.Decorator; +import VASSAL.counters.EditablePiece; +import VASSAL.counters.GamePiece; +import VASSAL.counters.ImagePicker; +import VASSAL.counters.KeyCommand; +import VASSAL.counters.PieceEditor; +import VASSAL.tools.DataArchive; +import VASSAL.tools.SequenceEncoder; -import BattleTech.MessageBox; - public class ViewInfo extends Decorator implements EditablePiece, ActionListener, ChangeListener { // declaration of constants Modified: VSQL-src/trunk/CASL/GameBuilder/CounterInfoFrame.java =================================================================== --- VSQL-src/trunk/CASL/GameBuilder/CounterInfoFrame.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/GameBuilder/CounterInfoFrame.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -8,10 +8,20 @@ package CASL.GameBuilder; -import java.awt.*; -import javax.swing.*; -import CASL.Unit.*; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Image; +import java.awt.Rectangle; +import java.awt.Toolkit; +import javax.swing.JFrame; +import javax.swing.JPanel; + +import CASL.Unit.Counter; + public class CounterInfoFrame extends JFrame { public final static int ALL_INFORMATION = 1; Modified: VSQL-src/trunk/CASL/GameBuilder/GameEditFrame_AboutBox.java =================================================================== --- VSQL-src/trunk/CASL/GameBuilder/GameEditFrame_AboutBox.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/GameBuilder/GameEditFrame_AboutBox.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -1,10 +1,21 @@ package CASL.GameBuilder; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.border.*; +import java.awt.AWTEvent; +import java.awt.BorderLayout; +import java.awt.FlowLayout; +import java.awt.Frame; +import java.awt.GridLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowEvent; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.border.EmptyBorder; + /** * Title: GameEditFrame_AboutBox.java * Copyright: Copyright (c) 2001 David Sullivan Zuericher Strasse 6 12205 Berlin Germany. All rights reserved. Modified: VSQL-src/trunk/CASL/GameBuilder/NewScenarioDialog.java =================================================================== --- VSQL-src/trunk/CASL/GameBuilder/NewScenarioDialog.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/GameBuilder/NewScenarioDialog.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -1,13 +1,32 @@ package CASL.GameBuilder; -import java.awt.*; -import java.util.*; -import java.text.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.border.*; -import CASL.Scenario.*; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.GridLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.text.DateFormat; +import java.util.Date; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JComboBox; +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JTextField; +import javax.swing.SwingConstants; +import javax.swing.border.Border; + +import CASL.Scenario.Scenario; + /** * Title: NewScenarioDialog.java * Copyright: Copyright (c) 2001 David Sullivan Zuericher Strasse 6 12205 Berlin Germany. All rights reserved. Modified: VSQL-src/trunk/CASL/GameBuilder/ScenarioSetupAreaDialog.java =================================================================== --- VSQL-src/trunk/CASL/GameBuilder/ScenarioSetupAreaDialog.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/GameBuilder/ScenarioSetupAreaDialog.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -1,13 +1,33 @@ package CASL.GameBuilder; -import java.awt.*; -import java.util.*; -import java.text.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.border.*; -import CASL.Scenario.*; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.GridLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.text.DateFormat; +import java.util.Date; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JComboBox; +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JTextField; +import javax.swing.SwingConstants; +import javax.swing.border.Border; + +import CASL.Scenario.Scenario; +import CASL.Scenario.ScenarioGroup; + public class ScenarioSetupAreaDialog extends JDialog { GameEditFrame frame; Modified: VSQL-src/trunk/CASL/Map/Bridge.java =================================================================== --- VSQL-src/trunk/CASL/Map/Bridge.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/Map/Bridge.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,9 +16,11 @@ */ package CASL.Map; -import java.io.*; -import java.awt.*; -import java.awt.geom.*; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.Shape; +import java.awt.geom.AffineTransform; +import java.io.Serializable; /** * Title: Bridge.java Modified: VSQL-src/trunk/CASL/Map/Hex.java =================================================================== --- VSQL-src/trunk/CASL/Map/Hex.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/Map/Hex.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,9 +16,13 @@ */ package CASL.Map; -import java.awt.*; -import java.io.*; -import java.util.*; +import java.awt.Point; +import java.awt.Polygon; +import java.awt.Rectangle; +import java.awt.Shape; +import java.io.Serializable; +import java.util.HashSet; +import java.util.Iterator; /** * Title: Hex.java Modified: VSQL-src/trunk/CASL/Map/LOSResult.java =================================================================== --- VSQL-src/trunk/CASL/Map/LOSResult.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/Map/LOSResult.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,11 +16,13 @@ */ package CASL.Map; -import java.awt.*; -import java.util.*; -import CASL.Unit.*; -import CASL.Scenario.*; +import java.awt.Point; +import java.util.HashSet; +import java.util.Iterator; +import CASL.Scenario.Scenario; +import CASL.Unit.Vehicle; + /** * Title: LOSResult.java * Copyright: Copyright (c) 2001 David Sullivan Zuericher Strasse 6 12205 Berlin Germany. All rights reserved. Modified: VSQL-src/trunk/CASL/Map/Location.java =================================================================== --- VSQL-src/trunk/CASL/Map/Location.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/Map/Location.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,8 +16,8 @@ */ package CASL.Map; -import java.awt.*; -import java.io.*; +import java.awt.Point; +import java.io.Serializable; /** * Title: Location.java Modified: VSQL-src/trunk/CASL/Map/MovementLogic.java =================================================================== --- VSQL-src/trunk/CASL/Map/MovementLogic.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/Map/MovementLogic.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,9 +16,10 @@ */ package CASL.Map; -import java.util.*; -import CASL.Unit.*; +import java.util.Iterator; +import CASL.Unit.Unit; + /** * Title: MovementLogic.java * Copyright: Copyright (c) 2001 David Sullivan Zuericher Strasse 6 12205 Berlin Germany. All rights reserved. Modified: VSQL-src/trunk/CASL/Map/PrefabBuilding.java =================================================================== --- VSQL-src/trunk/CASL/Map/PrefabBuilding.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/Map/PrefabBuilding.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,9 +16,10 @@ */ package CASL.Map; -import java.awt.*; -import java.io.*; -import java.awt.geom.*; +import java.awt.Polygon; +import java.awt.Shape; +import java.awt.geom.AffineTransform; +import java.io.Serializable; /** * Title: PrefabBuilding.java Modified: VSQL-src/trunk/CASL/Map/Smoke.java =================================================================== --- VSQL-src/trunk/CASL/Map/Smoke.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/Map/Smoke.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,7 +16,7 @@ */ package CASL.Map; -import java.io.*; +import java.io.Serializable; /** * Title: Smoke.java Modified: VSQL-src/trunk/CASL/Map/Terrain.java =================================================================== --- VSQL-src/trunk/CASL/Map/Terrain.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/Map/Terrain.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,8 +16,8 @@ */ package CASL.Map; -import java.awt.*; -import java.io.*; +import java.awt.Color; +import java.io.Serializable; /** * Title: Terrain.java @@ -275,7 +275,7 @@ public final static int TOWER_3_LEVEL_OBSTACLE = 165; - public static final Terrain[] getTerrainList() { + public static synchronized final Terrain[] getTerrainList() { if (terrainList == null) { terrainList = new Terrain[256]; Modified: VSQL-src/trunk/CASL/MapBuilder/BridgeSelection.java =================================================================== --- VSQL-src/trunk/CASL/MapBuilder/BridgeSelection.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/MapBuilder/BridgeSelection.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,9 +16,12 @@ */ package CASL.MapBuilder; -import java.awt.*; -import CASL.Map.*; +import java.awt.Graphics2D; +import java.awt.Shape; +import CASL.Map.Bridge; +import CASL.Map.Hex; + public class BridgeSelection extends Selection { Modified: VSQL-src/trunk/CASL/MapBuilder/CustomBridgeDialog.java =================================================================== --- VSQL-src/trunk/CASL/MapBuilder/CustomBridgeDialog.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/MapBuilder/CustomBridgeDialog.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -15,11 +15,27 @@ * at http://www.opensource.org. */ package CASL.MapBuilder; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.border.*; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.GridLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JTextField; +import javax.swing.SwingConstants; +import javax.swing.border.Border; + /** * Title: CustomBridgeDialog.java * Copyright: Copyright (c) 2001 David Sullivan Zuericher Strasse 6 12205 Berlin Germany. All rights reserved. Modified: VSQL-src/trunk/CASL/MapBuilder/CustomBuildingDialog.java =================================================================== --- VSQL-src/trunk/CASL/MapBuilder/CustomBuildingDialog.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/MapBuilder/CustomBuildingDialog.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -15,11 +15,27 @@ * at http://www.opensource.org. */ package CASL.MapBuilder; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.border.*; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.GridLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JTextField; +import javax.swing.SwingConstants; +import javax.swing.border.Border; + /** * Title: CustomBuildingDialog.java * Copyright: Copyright (c) 2001 David Sullivan Zuericher Strasse 6 12205 Berlin Germany. All rights reserved. Modified: VSQL-src/trunk/CASL/MapBuilder/HexSelection.java =================================================================== --- VSQL-src/trunk/CASL/MapBuilder/HexSelection.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/MapBuilder/HexSelection.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,9 +16,11 @@ */ package CASL.MapBuilder; -import java.awt.*; -import CASL.Map.*; +import java.awt.Graphics2D; +import java.awt.Shape; +import CASL.Map.Hex; + /** * Title: HexSelection.java * Copyright: Copyright (c) 2001 David Sullivan Zuericher Strasse 6 12205 Berlin Germany. All rights reserved. Modified: VSQL-src/trunk/CASL/MapBuilder/HexsideSelection.java =================================================================== --- VSQL-src/trunk/CASL/MapBuilder/HexsideSelection.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/MapBuilder/HexsideSelection.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,9 +16,12 @@ */ package CASL.MapBuilder; -import java.awt.*; -import CASL.Map.*; +import java.awt.Graphics2D; +import java.awt.Rectangle; +import java.awt.Shape; +import CASL.Map.Location; + /** * Title: HexsideSelection.java * Copyright: Copyright (c) 2001 David Sullivan Zuericher Strasse 6 12205 Berlin Germany. All rights reserved. Modified: VSQL-src/trunk/CASL/MapBuilder/InsertMapDialog.java =================================================================== --- VSQL-src/trunk/CASL/MapBuilder/InsertMapDialog.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/MapBuilder/InsertMapDialog.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -15,10 +15,26 @@ * at http://www.opensource.org. */ package CASL.MapBuilder; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.border.*; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.GridLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; + +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JTextField; +import javax.swing.SwingConstants; +import javax.swing.border.Border; + import CASL.Map.GameMap; /** Modified: VSQL-src/trunk/CASL/MapBuilder/MapBuilder.java =================================================================== --- VSQL-src/trunk/CASL/MapBuilder/MapBuilder.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/MapBuilder/MapBuilder.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -22,7 +22,7 @@ import javax.swing.UIManager; -import CASL.MapBuilder.Utility.CASLProperties; +import CASL.MapBuilder.Utility.CASLProperties; /** * Title: MapBuilder.java Modified: VSQL-src/trunk/CASL/MapBuilder/MapEditFrameBeanInfo.java =================================================================== --- VSQL-src/trunk/CASL/MapBuilder/MapEditFrameBeanInfo.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/MapBuilder/MapEditFrameBeanInfo.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,7 +16,11 @@ */ package CASL.MapBuilder; -import java.beans.*; +import java.beans.BeanInfo; +import java.beans.IntrospectionException; +import java.beans.Introspector; +import java.beans.PropertyDescriptor; +import java.beans.SimpleBeanInfo; public class MapEditFrameBeanInfo extends SimpleBeanInfo { Class beanClass = MapEditFrame.class; Modified: VSQL-src/trunk/CASL/MapBuilder/MapEditFrame_AboutBox.java =================================================================== --- VSQL-src/trunk/CASL/MapBuilder/MapEditFrame_AboutBox.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/MapBuilder/MapEditFrame_AboutBox.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,11 +16,22 @@ */ package CASL.MapBuilder; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.border.*; +import java.awt.AWTEvent; +import java.awt.BorderLayout; +import java.awt.FlowLayout; +import java.awt.Frame; +import java.awt.GridLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowEvent; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.border.EmptyBorder; + public class MapEditFrame_AboutBox extends JDialog implements ActionListener { private JPanel panel1 = new JPanel(); Modified: VSQL-src/trunk/CASL/MapBuilder/MapEditor.java =================================================================== --- VSQL-src/trunk/CASL/MapBuilder/MapEditor.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/MapBuilder/MapEditor.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -37,8 +37,6 @@ import java.awt.geom.AffineTransform; import java.awt.geom.Ellipse2D; import java.awt.image.BufferedImage; -import java.awt.image.ColorModel; -import java.awt.image.PixelGrabber; import java.io.BufferedReader; import java.io.File; import java.io.FileOutputStream; @@ -50,7 +48,6 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import javax.swing.ImageIcon; import javax.swing.JComponent; import javax.swing.JOptionPane; import javax.swing.JPopupMenu; Modified: VSQL-src/trunk/CASL/MapBuilder/MessageFrame.java =================================================================== --- VSQL-src/trunk/CASL/MapBuilder/MessageFrame.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/MapBuilder/MessageFrame.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,9 +16,13 @@ */ package CASL.MapBuilder; -import java.awt.*; -import javax.swing.*; +import java.awt.BorderLayout; +import java.awt.Dimension; +import javax.swing.JFrame; +import javax.swing.JScrollPane; +import javax.swing.JTextArea; + /** * Title: MessageFrame.java * Copyright: Copyright (c) 2001 David Sullivan Zuericher Strasse 6 12205 Berlin Germany. All rights reserved. Modified: VSQL-src/trunk/CASL/MapBuilder/NewMapDialog.java =================================================================== --- VSQL-src/trunk/CASL/MapBuilder/NewMapDialog.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/MapBuilder/NewMapDialog.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -15,11 +15,26 @@ * at http://www.opensource.org. */ package CASL.MapBuilder; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.border.*; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.GridLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JTextField; +import javax.swing.SwingConstants; +import javax.swing.border.Border; + /** * Title: NewMapDialog.java * Copyright: Copyright (c) 2001 David Sullivan Zuericher Strasse 6 12205 Berlin Germany. All rights reserved. Modified: VSQL-src/trunk/CASL/MapBuilder/PopupMenuAction.java =================================================================== --- VSQL-src/trunk/CASL/MapBuilder/PopupMenuAction.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/MapBuilder/PopupMenuAction.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,10 +16,12 @@ */ package CASL.MapBuilder; -import java.awt.event.*; -import javax.swing.*; +import java.awt.event.ActionEvent; +import javax.swing.AbstractAction; +import javax.swing.Action; + /** * Title: PopupMenuAction.java * Copyright: Copyright (c) 2001 David Sullivan Zuericher Strasse 6 12205 Berlin Germany. All rights reserved. Modified: VSQL-src/trunk/CASL/MapBuilder/PrefabBuildingDialog.java =================================================================== --- VSQL-src/trunk/CASL/MapBuilder/PrefabBuildingDialog.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/MapBuilder/PrefabBuildingDialog.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -15,12 +15,28 @@ * at http://www.opensource.org. */ package CASL.MapBuilder; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.border.*; -import CASL.Map.*; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.GridLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.SwingConstants; +import javax.swing.border.Border; + +import CASL.Map.PrefabBuilding; + /** * Title: PrefabBuildingDialog.java * Copyright: Copyright (c) 2001 David Sullivan Zuericher Strasse 6 12205 Berlin Germany. All rights reserved. Modified: VSQL-src/trunk/CASL/MapBuilder/RectangularSelection.java =================================================================== --- VSQL-src/trunk/CASL/MapBuilder/RectangularSelection.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/MapBuilder/RectangularSelection.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,8 +16,10 @@ */ package CASL.MapBuilder; -import java.awt.*; -import java.awt.geom.*; +import java.awt.Graphics2D; +import java.awt.Rectangle; +import java.awt.Shape; +import java.awt.geom.Ellipse2D; /** * Title: RectangularSelection.java Modified: VSQL-src/trunk/CASL/MapBuilder/Selection.java =================================================================== --- VSQL-src/trunk/CASL/MapBuilder/Selection.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/MapBuilder/Selection.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,7 +16,9 @@ */ package CASL.MapBuilder; -import java.awt.*; +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.Shape; /** * Title: Selection.java Modified: VSQL-src/trunk/CASL/MapBuilder/Utility/AskYesNoDialog.java =================================================================== --- VSQL-src/trunk/CASL/MapBuilder/Utility/AskYesNoDialog.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/MapBuilder/Utility/AskYesNoDialog.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -15,11 +15,24 @@ * at http://www.opensource.org. */ package CASL.MapBuilder.Utility; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.border.*; +import java.awt.Color; +import java.awt.Frame; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.GridLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JPanel; +import javax.swing.JTextField; +import javax.swing.border.Border; + /** * Title: AskYesNoDialog.java * Copyright: Copyright (c) 2001 David Sullivan Zuericher Strasse 6 12205 Berlin Germany. All rights reserved. Modified: VSQL-src/trunk/CASL/MapBuilder/Utility/CASLProperties.java =================================================================== --- VSQL-src/trunk/CASL/MapBuilder/Utility/CASLProperties.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/MapBuilder/Utility/CASLProperties.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,8 +16,8 @@ */ package CASL.MapBuilder.Utility; -import java.util.*; -import java.io.*; +import java.io.FileInputStream; +import java.util.Properties; /** * Title: CASLProperties.java Modified: VSQL-src/trunk/CASL/MapBuilder/Utility/chooseFileDialog.java =================================================================== --- VSQL-src/trunk/CASL/MapBuilder/Utility/chooseFileDialog.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/MapBuilder/Utility/chooseFileDialog.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,9 +16,11 @@ */ package CASL.MapBuilder.Utility; -import java.awt.*; -import javax.swing.*; +import java.awt.BorderLayout; +import javax.swing.JFileChooser; +import javax.swing.JFrame; + /** * Title: chooseFileDialog.java * Copyright: Copyright (c) 2001 David Sullivan Zuericher Strasse 6 12205 Berlin Germany. All rights reserved. Modified: VSQL-src/trunk/CASL/MapBuilder/VASLColorMap.java =================================================================== --- VSQL-src/trunk/CASL/MapBuilder/VASLColorMap.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/MapBuilder/VASLColorMap.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,9 +16,10 @@ */ package CASL.MapBuilder; -import java.awt.*; -import CASL.Map.*; +import java.awt.Color; +import CASL.Map.Terrain; + /** * Title: VASLColorMap.java * Copyright: Copyright (c) 2001 David Sullivan Zuericher Strasse 6 12205 Berlin Germany. All rights reserved. Modified: VSQL-src/trunk/CASL/MapBuilder/VASLMapConverter.java =================================================================== --- VSQL-src/trunk/CASL/MapBuilder/VASLMapConverter.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/MapBuilder/VASLMapConverter.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,10 +16,17 @@ */ package CASL.MapBuilder; -import java.awt.*; -import java.awt.image.*; -import CASL.Map.*; +import java.awt.Color; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.Shape; +import java.awt.image.BufferedImage; +import CASL.Map.GameMap; +import CASL.Map.Hex; +import CASL.Map.Location; +import CASL.Map.Terrain; + /** * Title: VASLColorMap.java * Copyright: Copyright (c) 2001 David Sullivan Zuericher Strasse 6 12205 Berlin Germany. All rights reserved. Modified: VSQL-src/trunk/CASL/MapBuilder/VASLMapConverterDialog.java =================================================================== --- VSQL-src/trunk/CASL/MapBuilder/VASLMapConverterDialog.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/MapBuilder/VASLMapConverterDialog.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -15,11 +15,26 @@ * at http://www.opensource.org. */ package CASL.MapBuilder; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.border.*; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.GridLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JTextField; +import javax.swing.SwingConstants; +import javax.swing.border.Border; + /** * Title: VASLMapConverterDialog.java * Copyright: Copyright (c) 2001 David Sullivan Zuericher Strasse 6 12205 Berlin Germany. All rights reserved. Modified: VSQL-src/trunk/CASL/Scenario/Game.java =================================================================== --- VSQL-src/trunk/CASL/Scenario/Game.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/Scenario/Game.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,8 +16,15 @@ */ package CASL.Scenario; -import java.io.*; -import java.util.zip.*; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; +import java.util.zip.GZIPInputStream; +import java.util.zip.GZIPOutputStream; /** * Title: Game.java Modified: VSQL-src/trunk/CASL/Unit/CounterPopupMenuAction.java =================================================================== --- VSQL-src/trunk/CASL/Unit/CounterPopupMenuAction.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/Unit/CounterPopupMenuAction.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,10 +16,12 @@ */ package CASL.Unit; -import java.awt.event.*; -import javax.swing.*; +import java.awt.event.ActionEvent; +import javax.swing.AbstractAction; +import javax.swing.Action; + public class CounterPopupMenuAction extends AbstractAction { Modified: VSQL-src/trunk/CASL/Unit/Stack.java =================================================================== --- VSQL-src/trunk/CASL/Unit/Stack.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/Unit/Stack.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,8 +16,9 @@ */ package CASL.Unit; -import java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.HashSet; +import java.util.Iterator; /** * Title: Stack.java Modified: VSQL-src/trunk/CASL/Unit/UnitPopupMenuAction.java =================================================================== --- VSQL-src/trunk/CASL/Unit/UnitPopupMenuAction.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/CASL/Unit/UnitPopupMenuAction.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -16,10 +16,12 @@ */ package CASL.Unit; -import java.awt.event.*; -import javax.swing.*; +import java.awt.event.ActionEvent; +import javax.swing.AbstractAction; +import javax.swing.Action; + public class UnitPopupMenuAction extends AbstractAction { Modified: VSQL-src/trunk/Dev/ExpressionEvaluator.java =================================================================== --- VSQL-src/trunk/Dev/ExpressionEvaluator.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/Dev/ExpressionEvaluator.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -34,8 +34,6 @@ import jep.jep.ParseException; import jep.jep.SymbolTable; import jep.jep.Variable; - - import VASSAL.build.GameModule; import VASSAL.build.module.GlobalOptions; import VASSAL.build.module.PlayerRoster; Modified: VSQL-src/trunk/GameTimer/GameTimer.java =================================================================== --- VSQL-src/trunk/GameTimer/GameTimer.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/GameTimer/GameTimer.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -5,12 +5,12 @@ import java.awt.Component; import java.awt.Dimension; import java.awt.Graphics; +import java.awt.Image; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.image.BufferedImage; import java.awt.image.ImageObserver; import java.awt.image.ImageProducer; -import java.awt.Image; import javax.swing.BorderFactory; import javax.swing.JDialog; Modified: VSQL-src/trunk/Inventory/InvCommandEncoder.java =================================================================== --- VSQL-src/trunk/Inventory/InvCommandEncoder.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/Inventory/InvCommandEncoder.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -18,7 +18,6 @@ */ package Inventory; -import Inventory.InvEmbellishment; import VASSAL.build.module.BasicCommandEncoder; import VASSAL.counters.Decorator; import VASSAL.counters.Embellishment; Modified: VSQL-src/trunk/PB/PBConcealable.java =================================================================== --- VSQL-src/trunk/PB/PBConcealable.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/PB/PBConcealable.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -41,7 +41,18 @@ import VASSAL.command.ChangePiece; import VASSAL.command.Command; import VASSAL.command.NullCommand; -import VASSAL.counters.*; +import VASSAL.counters.BasicPiece; +import VASSAL.counters.Decorator; +import VASSAL.counters.Delete; +import VASSAL.counters.EditablePiece; +import VASSAL.counters.Embellishment; +import VASSAL.counters.GamePiece; +import VASSAL.counters.Hideable; +import VASSAL.counters.Obscurable; +import VASSAL.counters.PieceEditor; +import VASSAL.counters.Properties; +import VASSAL.counters.SimplePieceEditor; +import VASSAL.counters.Stack; import VASSAL.tools.SequenceEncoder; public class PBConcealable extends Obscurable implements EditablePiece { Modified: VSQL-src/trunk/PB/PBConcealment.java =================================================================== --- VSQL-src/trunk/PB/PBConcealment.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/PB/PBConcealment.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -18,18 +18,30 @@ */ package PB; +import java.awt.Component; +import java.awt.Graphics; +import java.awt.Rectangle; +import java.awt.Shape; + +import javax.swing.KeyStroke; + import VASL.counters.ASLProperties; import VASL.counters.ColoredBox; import VASSAL.build.GameModule; import VASSAL.build.module.ObscurableOptions; import VASSAL.command.ChangePiece; import VASSAL.command.Command; -import VASSAL.counters.*; +import VASSAL.counters.BoundsTracker; +import VASSAL.counters.Decorator; +import VASSAL.counters.EditablePiece; +import VASSAL.counters.GamePiece; +import VASSAL.counters.KeyCommand; +import VASSAL.counters.PieceEditor; +import VASSAL.counters.Properties; +import VASSAL.counters.SimplePieceEditor; +import VASSAL.counters.Stack; import VASSAL.tools.SequenceEncoder; -import javax.swing.*; -import java.awt.*; - /** * A Concealment counter */ Modified: VSQL-src/trunk/PB/PBMassKeyMenu.java =================================================================== --- VSQL-src/trunk/PB/PBMassKeyMenu.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/PB/PBMassKeyMenu.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -15,8 +15,8 @@ import VASSAL.build.AbstractConfigurable; import VASSAL.build.Buildable; import VASSAL.build.GameModule; +import VASSAL.build.module.Chatter; import VASSAL.build.module.Map; -import VASSAL.build.module.Chatter; import VASSAL.build.module.documentation.HelpFile; import VASSAL.command.Command; import VASSAL.command.NullCommand; Modified: VSQL-src/trunk/PB/PBNotesWindow.java =================================================================== --- VSQL-src/trunk/PB/PBNotesWindow.java 2009-02-09 05:40:11 UTC (rev 5077) +++ VSQL-src/trunk/PB/PBNotesWindow.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -44,7 +44,6 @@ import javax.swing.JComboBox; import javax.swing.JDialog; import javax.swing.JEditorPane; -import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JScrollPane; @@ -62,7 +61,6 @@ import VASSAL.build.module.documentation.HelpFile; import VASSAL.build.module.noteswindow.PrivateNotesController; import VASSAL.build.module.noteswindow.SecretNotesController; -import VASSAL.build.widget.HtmlChart.HtmlChartHyperlinkListener; import VASSAL.command.Command; import VASSAL.command.CommandEncoder; import VASSAL.command.NullCommand; Added: VSQL-src/trunk/RSG/RSG.java =================================================================== --- VSQL-src/trunk/RSG/RSG.java (rev 0) +++ VSQL-src/trunk/RSG/RSG.java 2009-02-09 05:40:45 UTC (rev 5078) @@ -0,0 +1,365 @@ +package RSG; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; +import java.util.Random; + +import javax.swing.KeyStroke; + +import VASSAL.build.AbstractConfigurable; +import VASSAL.build.AutoConfigurable; +import VASSAL.build.Buildable; +import VASSAL.build.GameModule; +import VASSAL.build.module.Chatter; +import VASSAL.command.Command; +import VASSAL.configure.Configurer; +import VASSAL.configure.ConfigurerFactory; +import VASSAL.configure.IconConfigurer; +import VASSAL.tools.LaunchButton; + +/** RandScen + * A RSG for Combat Commander + * by Tim McCarron + * + */ +public class RSG extends AbstractConfigurable { +protected LaunchButton launch; // RSG Button +private Random randgen = new Random(); // Random number +private int roll1die() {return randgen.nextInt(6) + randgen.nextInt(6);} +private int roll2die() {return randgen.nextInt(6) + randgen.nextInt(6);} +private int rollAxisQ2die() {return randgen.nextInt(6) + randgen.nextInt(6);} +private int rollAllied2die() {return randgen.nextInt(6) + randgen.nextInt(6);} +private int rollAlliedQ2die() {return randgen.nextInt(6) + randgen.nextInt(6);} +private int mapboard = 0; // mapboard array index +private int orientation = 0; // mapboard orientation +private static int year = 0; +private static int actual = 0; +private static String axisplayer = ""; +private static String alliedplayer = ""; +private String axistroopquality = ""; +private String alliedtroopquality = ""; +final static String[] orientmap = new String[] {"Top", //0 + "Bottom", "Left", "Right"}; +final static String[] TABLE3A = new String[] {"German", // 0 + "German", "German", "German", "German", "German", // 5 + "German", "German", "Italy", "Italy", "Italian"}; // 10 +final static int[] TABLE4A = {1939, 1943, 1940, 1945, 1941, 1942, 1943, 1944, 1944, 1944, 1944}; +final static int[] TABLE4B = {1942, 1943, 1939, 1944, 1943, 1940, 1941, 1942, 1941, 1942, 1942}; +final static String[] TABLE5A_39 = {"France", "France", "France", "France", "France", "France", "France", "France", "France", "France", "France"}; +final static String[] TABLE5A_40 = {"France", "France", "France", "France", "France", "France", "France", "Britain", "Britain", "Britain", "Britain"}; +final static String[] TABLE5A_41 = {"France", "France", "France", "Soviet", "Soviet", "Soviet", "Soviet", "Britain", "Britain", "Britain", "Britain"}; +final static String[] TABLE5A_42 = {"Soviet", "Soviet", "Soviet", "Soviet", "Soviet", "Soviet", "Soviet", "Britain", "Britain", "Britain", "Britain"}; +final static String[] TABLE5A_43 = {"France", "US", "US", "US", "Soviet", "Soviet", "Soviet", "Soviet", "Britain", "Britain", "Britain"}; +final static String[] TABLE5A_44 = {"France", "Soviet", "US", "US", "US", "Soviet", "Soviet", "Soviet", "Britain", "Britain", "Britain"}; +final static String[] TABLE5A_45 = {"France", "Soviet", "US", "US", "US", "Soviet", "Soviet", "Soviet", "Britain", "Britain", "Britain"}; +final static String[] TABLE5B_39 = {"France", "Soviet", "Soviet", "Soviet", "Soviet", "Soviet", "Soviet", "Soviet", "Soviet", "Soviet", "Soviet"}; +final static String[] TABLE5B_40 = {"France", "France", "France", "France", "France", "Britain", "Britain", "Britain", "Britain", "Soviet", "Soviet"}; +final static String[] TABLE5B_41 = {"France", "France", "France", "Britain", "Britain", "Britain", "Britain", "Soviet", "Soviet", "Soviet", "Soviet"}; +final static String[] TABLE5B_42 = {"Britain", "Britain", "Britain", "Britain", "Britain", "Soviet", "Soviet", "Soviet", "Soviet", "Soviet", "Soviet"}; +final static String[] TABLE5B_43 = {"Britain", "Britain", "Britain", "US", "US", "US", "US", "Soviet", "Soviet", "Soviet", "Soviet"}; +final static String[] TABLE5B_44 = {"Soviet", "Soviet", "Soviet", "Soviet", "Soviet", "Soviet", "Soviet", "Soviet", "Soviet", "Soviet", "Soviet"}; +final static String[] TABLE6A_3941 = {"Elite", "Elite", "Elite", "Elite", "Elite", "Line", "Line", "Line", "Line", "Line", "Line"}; +final static String[] TABLE6A_42 = {"Elite", "Elite", "Elite", "Elite", "Elite", "Line", "Line", "Line", "Line", "Line", "Green"}; +final static String[] TABLE6A_4344 = {"Elite", "Elite", "Elite", "Elite", "Line", "Line", "Line", "Line", "Line", "Green", "Green"}; +final static String[] TABLE6A_45 = {"Elite", "Elite", "Elite", "Line", "Line", "Line", "Line", "Green", "Green", "Green", "Green"}; +final static String[] TABLE6B_3943NS = {"Elite", "Elite", "Elite", "Line", "Line", "Line", "Line", "Green", "Green", "Green", "Green"}; +final static String[] TABLE6B_3940 = {"Elite", "Elite", "Elite", "Elite", "Elite", "Elite", "Elite", "Elite", "Elite", "Elite", "Elite"}; +final static String[] TABLE6B_4144 = {"Elite", "Elite", "Elite", "Elite", "Line", "Line", "Line", "Line", "Line", "Line", "Green"}; +final static String[] TABLE7A_43 = {"Elite", "Elite", "Line", "Line", "Line", "Line", "Line", "Green", "Green", "Green", "Green"}; +final static String[] TABLE7A_44 = {"Elite", "Elite", "Elite", "Line", "Line", "Line", "Line", "Line", "Line", "Green", "Green"}; +final static String[] TABLE7A_45 = {"Elite", "Elite", "Elite", "Elite", "Elite", "Elite", "Elite", "Line", "Line", "Line", "Green"}; +final static String[] TABLE7B_40 = {"Elite", "Elite", "Elite", "Elite", "Line", "Line", "Line", "Line", "Green", "Green", "Green"}; +final static String[] TABLE7B_4142 = {"Elite", "Elite", "Elite", "Elite", "Elite", "Line", "Line", "Line", "Line", "Line", "Green"}; +final static String[] TABLE7B_43 = {"Elite", "Elite", "Elite", "Elite", "Elite", "Elite", "Line", "Line", "Line", "Line", "Green"}; +final static String[] TABLE7B_44 = {"Elite", "Elite", "Elite", "Elite", "Elite", "Elite", "Elite", "Line", "Line", "Line", "Green"}; +final static String[] TABLE7B_45 = {"Elite", "Elite", "Elite", "Line", "Line", "Line", "Line", "Line", "Green", "Green", "Green"}; +final static String[] TABLE7C_39 = {"Line", "Line", "Line", "Line", "Line", "Line", "Line", "Line", "Line", "Line", "Line"}; +final static String[] TABLE7C_40 = {"Elite", "Elite", "Elite", "Elite", "Line", "Line", "Line", "Line", "Green", "Green", "Green"}; +final static String[] TABLE7C_41 = {"Line", "Line", "Line", "Line", "Line", "Line", "Green", "Green", "Green", "Green", "Green"}; +final static String[] TABLE7C_4345 = {"Elite", "Elite", "Elite", "Elite", "Elite", "Elite", "Elite", "Elite", "Elite", "Elite", "Elite"}; +final static String[] TABLE7D_3940 = {"Elite", "Elite", "Elite", "Line", "Line", "Line", "Line", "Line", "Line", "Line", "Line"}; +final static String[] TABLE7D_41 = {"Elite", "Elite", "Line", "Line", "Line", "Line", "Line", "Green", "Green", "Green", "Green"}; +final static String[] TABLE7D_42 = {"Elite", "Elite", "Elite", "Line", "Line", "Line", "Line", "Line", "Green", "Green", "Green"}; +final static String[] TABLE7D_43 = {"Elite", "Elite", "Elite", "Elite", "Line", "Line", "Line", "Line", "Line", "Green", "Green"}; +final static String[] TABLE7D_44 = {"Elite", "Elite", "Elite", "Elite", "Line", "Line", "Line", "Line", "Line", "Line", "Green"}; +final static String[] TABLE7D_45 = {"Elite", "Elite", "Elite", "Elite", "Elite", "Line", "Line", "Line", "Line", "Line", "Line"}; + +/* + * ***************************** R a n d ****************************** + * This class is used for the CC VASSAL mod. + * It selects a random scenario for the game. It randomly selects the + * forces, the troop types, timeframe, map and orientation. * * + * ******************************************************************** + */ +public RSG() { + + ActionListener al = new ActionListener() { + public void actionPerformed(ActionEvent e) { + generateAndDisplayScenario(); + } + }; + launch = new LaunchButton(null, TOOLTIP, BUTTON_TEXT, HOTKEY, ICON_NAME, al); + launch.setAttribute(TOOLTIP, "Generate Random Scenario Information"); + launch.setAttribute(HOTKEY, KeyStroke.getKeyStroke(KeyEvent.VK_R, KeyEvent.CTRL_MASK + + KeyEvent.SHIFT_MASK));... [truncated message content] |